..

SubProject/FPJ0000/FPJ0000.csproj

@@ -170,6 +170,9 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>dsQuery.xsd</DependentUpon>
     </Compile>
+    <Compile Include="dsReport.cs">
+      <DependentUpon>dsReport.xsd</DependentUpon>
+    </Compile>
     <Compile Include="dsReport.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>

SubProject/FPJ0000/JobReport_/fJobReport_Add.cs

@@ -114,7 +114,7 @@ namespace FPJ0000.JobReport_
             this.cmbProcess.ValueMember = "Value";
             this.cmbProcess.DataSource = dt_process;
 
-            if(getKisulInput)
+            if (getKisulInput)
             {
                 //기술분류
                 var dt_kisuldiv = FCOMMON.DBM.getCodeTable("50");
@@ -148,9 +148,9 @@ namespace FPJ0000.JobReport_
             tbTag.Text = dr.tag;
 
 
-            if(dr.ot > 0)
+            if (dr.ot > 0)
             {
-                if(dr.ot2  == 0)
+                if (dr.ot2 == 0)
                 {
                     lbOt2.Text = "관리자 연장/휴일 근무 승인이 완료되지 않았습니다";
                     lbOt2.ForeColor = Color.Blue;
@@ -161,14 +161,14 @@ namespace FPJ0000.JobReport_
                     lbOt2.Text = $"승인시간:{dr.ot2}";
                     lbotReason.Text = $"사유:{dr.otReason}";
                 }
-                
+
             }
             else
             {
                 lbOt2.Visible = false;
                 lbotReason.Visible = false;
             }
-            
+
 
             if (getKisulInput)
             {
@@ -223,7 +223,7 @@ namespace FPJ0000.JobReport_
                 {
                     this.richTextBoxEx1.Rtf = dr.description2;
                 }
-                catch 
+                catch
                 {
                     this.richTextBoxEx1.Text = dr.description;
                 }
@@ -232,7 +232,7 @@ namespace FPJ0000.JobReport_
             this.Show();
             Application.DoEvents();
 
-           if(dr.ot > 0 && dr.ot2 > 0)
+            if (dr.ot > 0 && dr.ot2 > 0)
             {
                 tbOt.Enabled = false;
                 FCOMMON.Util.MsgE("휴일/연장 근무시간이 관리자에의해 확정되었으므로 초과시간을 변경할 수 없습니다");
@@ -259,12 +259,25 @@ namespace FPJ0000.JobReport_
 
             //ed.DisplayEditForm(this.panel1);
             //ed.AllowRtf = true;
-            if(ReadMode)
+            if (ReadMode)
             {
                 panel1.Enabled = false;
                 this.Text += "(읽기전용)";
-                
+
-            }    
+            }
+
+            //신규데이터라면 양식을 처리한다.
+            if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added)
+            {
+                //해당 데이터의 메일 양식을 검사해서 데이터를 적용해준다.
+                var db = new EEEntities();
+                var dr0 = db.EETGW_DocuForm.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.cate == "J0").FirstOrDefault();
+                if (dr0 != null)
+                {
+                    richTextBoxEx1.Rtf = dr0.body;
+                }
+                db.Dispose();
+            }
 
 
             bInit = true;
@@ -510,13 +523,13 @@ namespace FPJ0000.JobReport_
             this.dr.process = cmbProcess.Text;
             this.dr.tag = tbTag.Text.Trim();
 
-            if(getKisulInput)
+            if (getKisulInput)
             {
                 this.dr.kisuldiv = cmb_kisuldiv.Text;
                 this.dr.kisullv = cmb_kisullv.Text;
                 this.dr.kisulamt = Decimal.Parse(textBox1.Text);
             }
-            
+
             if (tbHrs.Text != "") this.dr.hrs = double.Parse(tbHrs.Text);
             else this.dr.hrs = 0;
 

SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs

@@ -42,8 +42,8 @@
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
             this.tbProcess = new System.Windows.Forms.ToolStripComboBox();
-            this.toolStripButton6 = new System.Windows.Forms.ToolStripButton();
             this.btSearch = new System.Windows.Forms.ToolStripButton();
+            this.toolStripButton6 = new System.Windows.Forms.ToolStripButton();
             ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
@@ -79,7 +79,7 @@
             this.dataGridView1.Name = "dataGridView1";
             this.dataGridView1.ReadOnly = true;
             this.dataGridView1.RowTemplate.Height = 23;
-            this.dataGridView1.Size = new System.Drawing.Size(1041, 591);
+            this.dataGridView1.Size = new System.Drawing.Size(1114, 662);
             this.dataGridView1.TabIndex = 1;
             // 
             // toolStrip1
@@ -97,7 +97,7 @@
             this.toolStripButton6});
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);
             this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(1041, 37);
+            this.toolStrip1.Size = new System.Drawing.Size(1114, 37);
             this.toolStrip1.TabIndex = 5;
             this.toolStrip1.Text = "toolStrip1";
             // 
@@ -123,6 +123,7 @@
             // tbMon
             // 
             this.tbMon.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tbMon.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbMon.Name = "tbMon";
             this.tbMon.Size = new System.Drawing.Size(90, 37);
             this.tbMon.Text = "1982-11";
@@ -156,16 +157,6 @@
             this.tbProcess.Size = new System.Drawing.Size(200, 37);
             this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged);
             // 
-            // toolStripButton6
-            // 
-            this.toolStripButton6.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image")));
-            this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripButton6.Name = "toolStripButton6";
-            this.toolStripButton6.Size = new System.Drawing.Size(89, 34);
-            this.toolStripButton6.Text = "내보내기";
-            this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click);
-            // 
             // btSearch
             // 
             this.btSearch.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
@@ -176,11 +167,21 @@
             this.btSearch.Text = "조회(&R)";
             this.btSearch.Click += new System.EventHandler(this.btSearch_Click);
             // 
+            // toolStripButton6
+            // 
+            this.toolStripButton6.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image")));
+            this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton6.Name = "toolStripButton6";
+            this.toolStripButton6.Size = new System.Drawing.Size(89, 34);
+            this.toolStripButton6.Text = "내보내기";
+            this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click);
+            // 
             // rJobReportDay
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1041, 628);
+            this.ClientSize = new System.Drawing.Size(1114, 699);
             this.Controls.Add(this.dataGridView1);
             this.Controls.Add(this.toolStrip1);
             this.Name = "rJobReportDay";

SubProject/FPJ0000/JobReport_/rJobReportDay.cs

@@ -117,12 +117,6 @@ namespace FPJ0000.JobReport_
                     var col = this.dataGridView1.Columns[i];
                     var dayStr = col.HeaderText.Substring(0, 2);
 
-                  
-
-                    
-
-
-
                     var daydata = dsReport.JobReportDay.Where(t => t.uid == userid && t.pdate.EndsWith(dayStr)).FirstOrDefault();
                     if (daydata != null)
                     {
@@ -143,10 +137,20 @@ namespace FPJ0000.JobReport_
                         {
                             //평일이다
                             sumOT += daydata.ot;
-                            rowdata.Add((daydata.hrs.ToString() + "+" + daydata.ot.ToString()));
+
+                            if(daydata.jobtype == "휴가")
+                            {
+                                if (daydata.hrs + daydata.ot == 8.0) rowdata.Add("휴가");
+                                else rowdata.Add((daydata.hrs.ToString() + "+" + daydata.ot.ToString()));
+                            }
+                            else
+                            {
+                                rowdata.Add((daydata.hrs.ToString() + "+" + daydata.ot.ToString()));
+                            }
+                            
                         }
                     }
-                    else rowdata.Add("--");
+                    else rowdata.Add("--"); //업무일지에 자료가 없다.
                 }
                 rowdata.Add(sum.ToString() + "+" + sumOT.ToString() + "(*" + sumFR.ToString() + ")");
                 this.dataGridView1.Rows.Add(rowdata.ToArray());
@@ -159,6 +163,7 @@ namespace FPJ0000.JobReport_
                     var cellvalue = "--";
                     if(dvrow.Cells[i].Value != null) cellvalue=  dvrow.Cells[i].Value.ToString();
                     if (cellvalue == "--") dvrow.Cells[i].Style.ForeColor = Color.Gray;
+                    else if (cellvalue == "휴가") dvrow.Cells[i].Style.ForeColor = Color.Tomato;
                     else
                     {
                         var datasplbu = cellvalue.Split('+');

SubProject/FPJ0000/JobReport_/rJobReportDay.resx

@@ -136,41 +136,41 @@
   <data name="toolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        F/BF1BgjglBE2VoolB0ElUUlcY0VCl0pbQVK8Qk1ATUSjBoxyiarHO+k04T6QO8dEnzpSe7z/WVmzvxv
+        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
-        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
+        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
-        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
+        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
-        xm/vOsuNKwg2Ij+oHfz2rvM/cLJAFuAScOUxZigi9cgXtaFQpEOx2ESFkwUY6IFLeXJFUVr0Pv6Imck5
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        d30DA5AFZ29rlp8a9ec6HUrzY3gCUp8mKlzKehU9kBVnL0SGjwoa5QDPsyU7ooUKl7yOASgEZy+E1Psl
-        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
+        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
-        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
+        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
 </value>
   </data>
   <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANTSURBVFhH7djZTxNRGAVw/gjjvq9tVWgBwaUguAtuidHE
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        Id32fqjCDDPi8lZTAKXi+EIUyxk0ZEwHdtk+c0DjjLjcVWZyoFScRs7i2mHbX0esSzOjIIyZEXd5JQVQ
+        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
-        Cq5UYUeJ0oBvH3wiTShJ/fEmqGTGgLicFSZyIC2O/86p5Y3o9X4RaUKYirfIkxmIcNnLaYCUuIIoE5ru
+        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
-        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
+        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
-        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
+        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
-        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
+        5xfb0HqnG0MDI/Df7sZZ+VPJuPypz8iBJDh+8OuWNI5NiDOyJ//05Hhc3hQaIAEu2uCnxeVNbiAH/g/c
-        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
+        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
 </value>
   </data>
   <data name="btSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -187,16 +187,16 @@
   <data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIPSURBVFhHYxgFtAKWPZYa5r3W5VTB/fYKUGOpByx7bUIt
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIESURBVFhH7ZXLK0RxFMfnD7GQlY2dmMkMTVnIu6QsyCsb
-        +mz+U4ptJzn+N++1eWjSZ6MENZo6gFoOXH9l43+vGb7UdyS1HHjqyZn/Z5+epb4jqenAF19fUt+R1HYg
+        pZTyTLYWM6MxxnilPBcWM57FgkIpMt4lNpI78grFCMUxv+POzVw/NbnnZ+N+p0/de/qdez73dn93DHpE
-        1R1JCwdS1ZG0ciDVHElLByI70qLX+r7ZRHsZqLXEA2o5cOaxOf/XXVqPFfcfnPjfss/2P8guqLXEA2o5
+        xWQzxSfbUxpI6EiLlS9LF5PdXGh0mEErlk4rJNvMp4kOc5x8aZpQCfoOpiCzJ4dekkpwQ9oEf8BPL0kp
-        kBg86kBK8agDKcUj14G1W+v/Tz08HYw9pnvDxQvWFcPFQ+dFoOjBhmnmwKottf9hYOHJRWAxx8ku/999
+        eBG8pJekFiSXFCFIKilKkExSpOBXSaMt5STJmRYjj40+VIK9awPg3fNx6Vh2gslhATZLHht9qASjQRfU
-        fQcWe/rh2X/biY4Y+tAxzRwIwuefXAA75tuvb+BQnHxoKpgPAiAPYNODjmnqwPglSf///vsLdtCSM8v+
+        ii6olf8r2DrXBu5VD5LhyVLqtd46pV44WBTRw0OYYPNsK4QztD6MNasrHW6Dt1gL3J+DxWn91qdGmCBj
-        v/7yBsy+/OwyuJbApgcd09SBILzj+k6wo2DgHxAmLUvFqhYbprkD/WcHw0MRBPbe3IdVHS5McwdWbq6G
+        W9pBmafXJ3yKrhU3nrOwG+D1qBEqWDpaAW/vbyg0ujkO1483eLx/vo//ErweNUIFGfOHCygVznvoVzFe
-        Og0Cnnx4SlTmgGGaOhDkkCfvn4AdBkt/IDD54FSs6rFhmjpwyqFpUCf9/1+2seL/2cfnwOyvP7/+957p
+        xV3LQ7hgXn+B8hRZFo+WuOt+Qrhg00yLrPYZ6T4Q1eYII1SQiUh3EoqF3z8W17Kbu56HUMGulW5ZCaB+
-        h1UPOqaZAz2m+/z//OML2EG3Xt0C59qsVblgPgisu7geqz50TDMHrr+4AeqU///LN1XBxc89Pg8WA2Wc
+        qhH8Z1t4HHwJQlZvLrdHjTDBDE82PDw/otDx1THu2uqJGjxn8e76uH1qhAn6didlFYCG6WalvnW2jTW2
-        mEXxKHqwYZo5MHZx4v+EpclgjFzmec3wg4v7zApA0YMN08yB1MKjDqQUjzqQUjzqQEoxWQ606LXTBWru
+        cYqHSyN6eAgTLBkph7KxSuTrNy+zJ1epZ/flR/TwECZIhS6oFV1QK7qgVn4laLSnJoSa2/+E0Cx5rB7i
-        oAsG2gW1dhRQGTAwAACtgPk32asT/QAAAABJRU5ErkJggg==
+        GAwfCJT5L4+U6JYAAAAASUVORK5CYII=
 </value>
   </data>
 </root>

SubProject/FPJ0000/dsReport.Designer.cs

@@ -929,6 +929,8 @@ namespace FPJ0000 {
             
             private global::System.Data.DataColumn columnprocesss;
             
+            private global::System.Data.DataColumn columnjobtype;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public JobReportDayDataTable() {
@@ -1010,6 +1012,14 @@ namespace FPJ0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public global::System.Data.DataColumn jobtypeColumn {
+                get {
+                    return this.columnjobtype;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -1047,7 +1057,7 @@ namespace FPJ0000 {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
-            public JobReportDayRow AddJobReportDayRow(string uid, string uname, string pdate, double hrs, double ot, string processs) {
+            public JobReportDayRow AddJobReportDayRow(string uid, string uname, string pdate, double hrs, double ot, string processs, string jobtype) {
                 JobReportDayRow rowJobReportDayRow = ((JobReportDayRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         uid,
@@ -1055,7 +1065,8 @@ namespace FPJ0000 {
                         pdate,
                         hrs,
                         ot,
-                        processs};
+                        processs,
+                        jobtype};
                 rowJobReportDayRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowJobReportDayRow);
                 return rowJobReportDayRow;
@@ -1092,6 +1103,7 @@ namespace FPJ0000 {
                 this.columnhrs = base.Columns["hrs"];
                 this.columnot = base.Columns["ot"];
                 this.columnprocesss = base.Columns["processs"];
+                this.columnjobtype = base.Columns["jobtype"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1109,6 +1121,8 @@ namespace FPJ0000 {
                 base.Columns.Add(this.columnot);
                 this.columnprocesss = new global::System.Data.DataColumn("processs", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnprocesss);
+                this.columnjobtype = new global::System.Data.DataColumn("jobtype", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnjobtype);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnuid,
                                 this.columnpdate}, true));
@@ -1121,6 +1135,8 @@ namespace FPJ0000 {
                 this.columnhrs.ReadOnly = true;
                 this.columnot.ReadOnly = true;
                 this.columnprocesss.MaxLength = 100;
+                this.columnjobtype.ReadOnly = true;
+                this.columnjobtype.MaxLength = 50;
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -3778,6 +3794,22 @@ namespace FPJ0000 {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public string jobtype {
+                get {
+                    if (this.IsjobtypeNull()) {
+                        return string.Empty;
+                    }
+                    else {
+                        return ((string)(this[this.tableJobReportDay.jobtypeColumn]));
+                    }
+                }
+                set {
+                    this[this.tableJobReportDay.jobtypeColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
             public bool IsunameNull() {
@@ -3825,6 +3857,18 @@ namespace FPJ0000 {
             public void SetprocesssNull() {
                 this[this.tableJobReportDay.processsColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public bool IsjobtypeNull() {
+                return this.IsNull(this.tableJobReportDay.jobtypeColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+            public void SetjobtypeNull() {
+                this[this.tableJobReportDay.jobtypeColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -5737,6 +5781,7 @@ ORDER BY yymm";
             tableMapping.ColumnMappings.Add("hrs", "hrs");
             tableMapping.ColumnMappings.Add("ot", "ot");
             tableMapping.ColumnMappings.Add("processs", "processs");
+            tableMapping.ColumnMappings.Add("jobtype", "jobtype");
             this._adapter.TableMappings.Add(tableMapping);
         }
         
@@ -5753,7 +5798,8 @@ ORDER BY yymm";
             this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
             this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
             this._commandCollection[0].Connection = this.Connection;
-            this._commandCollection[0].CommandText = @"SELECT  ISNULL(EETGW_GroupUser.Process, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot
+            this._commandCollection[0].CommandText = @"SELECT  ISNULL(EETGW_GroupUser.Process, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot, MAX(JobReport.type) 
+               AS jobtype
 FROM     JobReport INNER JOIN
                EETGW_GroupUser ON JobReport.gcode = EETGW_GroupUser.gcode AND JobReport.uid = EETGW_GroupUser.uid LEFT OUTER JOIN
                Users ON JobReport.uid = Users.id

SubProject/FPJ0000/dsReport.cs

@@ -0,0 +1,11 @@
+namespace FPJ0000
+{
+
+
+    partial class dsReport
+    {
+        partial class JobReportDayDataTable
+        {
+        }
+    }
+}

SubProject/FPJ0000/dsReport.xsd

@@ -61,7 +61,8 @@ ORDER BY yymm</CommandText>
               <DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT  ISNULL(EETGW_GroupUser.Process, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot
+                    <CommandText>SELECT  ISNULL(EETGW_GroupUser.Process, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot, MAX(JobReport.type) 
+               AS jobtype
 FROM     JobReport INNER JOIN
                EETGW_GroupUser ON JobReport.gcode = EETGW_GroupUser.gcode AND JobReport.uid = EETGW_GroupUser.uid LEFT OUTER JOIN
                Users ON JobReport.uid = Users.id
@@ -84,6 +85,7 @@ ORDER BY processs, JobReport.pdate, uname</CommandText>
               <Mapping SourceColumn="hrs" DataSetColumn="hrs" />
               <Mapping SourceColumn="ot" DataSetColumn="ot" />
               <Mapping SourceColumn="processs" DataSetColumn="processs" />
+              <Mapping SourceColumn="jobtype" DataSetColumn="jobtype" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -298,7 +300,7 @@ ORDER BY pdate</CommandText>
   <xs:element name="dsReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsReport" msprop:Generator_UserDSName="dsReport">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_RowEvArgName="jobReportRowChangeEvent" msprop:Generator_RowClassName="jobReportRow">
+        <xs:element name="jobReport" msprop:Generator_TableClassName="jobReportDataTable" msprop:Generator_TableVarName="tablejobReport" msprop:Generator_RowChangedName="jobReportRowChanged" msprop:Generator_TablePropName="jobReport" msprop:Generator_RowDeletingName="jobReportRowDeleting" msprop:Generator_RowChangingName="jobReportRowChanging" msprop:Generator_RowEvHandlerName="jobReportRowChangeEventHandler" msprop:Generator_RowDeletedName="jobReportRowDeleted" msprop:Generator_RowClassName="jobReportRow" msprop:Generator_UserTableName="jobReport" msprop:Generator_RowEvArgName="jobReportRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="yymm" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnyymm" msprop:Generator_ColumnPropNameInRow="yymm" msprop:Generator_ColumnPropNameInTable="yymmColumn" msprop:Generator_UserColumnName="yymm">
@@ -338,10 +340,10 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent" msprop:Generator_RowClassName="JobReportDayRow">
+        <xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_RowClassName="JobReportDayRow" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid">
+              <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
@@ -355,7 +357,7 @@ ORDER BY pdate</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate">
+              <xs:element name="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="10" />
@@ -371,10 +373,17 @@ ORDER BY pdate</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="jobtype" msdata:ReadOnly="true" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="jobtype" msprop:Generator_ColumnVarNameInTable="columnjobtype" msprop:Generator_ColumnPropNameInTable="jobtypeColumn" msprop:Generator_UserColumnName="jobtype" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent" msprop:Generator_RowClassName="ProcessListRow">
+        <xs:element name="ProcessList" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_RowClassName="ProcessListRow" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="processs" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:Generator_UserColumnName="processs">
@@ -387,7 +396,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent" msprop:Generator_RowClassName="ProcessUserListRow">
+        <xs:element name="ProcessUserList" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_RowClassName="ProcessUserListRow" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id" minOccurs="0">
@@ -411,14 +420,14 @@ ORDER BY pdate</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="indate" msprop:Generator_ColumnVarNameInTable="columnindate" msprop:Generator_ColumnPropNameInRow="indate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="indateColumn" msprop:Generator_UserColumnName="indate" minOccurs="0">
+              <xs:element name="indate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="indate" msprop:Generator_ColumnVarNameInTable="columnindate" msprop:Generator_ColumnPropNameInTable="indateColumn" msprop:Generator_UserColumnName="indate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="outdate" msprop:Generator_ColumnVarNameInTable="columnoutdate" msprop:Generator_ColumnPropNameInRow="outdate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="outdateColumn" msprop:Generator_UserColumnName="outdate" minOccurs="0">
+              <xs:element name="outdate" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="outdate" msprop:Generator_ColumnVarNameInTable="columnoutdate" msprop:Generator_ColumnPropNameInTable="outdateColumn" msprop:Generator_UserColumnName="outdate" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="20" />
@@ -428,7 +437,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="PartSummary" msprop:Generator_TableClassName="PartSummaryDataTable" msprop:Generator_TableVarName="tablePartSummary" msprop:Generator_TablePropName="PartSummary" msprop:Generator_RowDeletingName="PartSummaryRowDeleting" msprop:Generator_RowChangingName="PartSummaryRowChanging" msprop:Generator_RowEvHandlerName="PartSummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="PartSummaryRowDeleted" msprop:Generator_UserTableName="PartSummary" msprop:Generator_RowChangedName="PartSummaryRowChanged" msprop:Generator_RowEvArgName="PartSummaryRowChangeEvent" msprop:Generator_RowClassName="PartSummaryRow">
+        <xs:element name="PartSummary" msprop:Generator_TableClassName="PartSummaryDataTable" msprop:Generator_TableVarName="tablePartSummary" msprop:Generator_RowChangedName="PartSummaryRowChanged" msprop:Generator_TablePropName="PartSummary" msprop:Generator_RowDeletingName="PartSummaryRowDeleting" msprop:Generator_RowChangingName="PartSummaryRowChanging" msprop:Generator_RowEvHandlerName="PartSummaryRowChangeEventHandler" msprop:Generator_RowDeletedName="PartSummaryRowDeleted" msprop:Generator_RowClassName="PartSummaryRow" msprop:Generator_UserTableName="PartSummary" msprop:Generator_RowEvArgName="PartSummaryRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ItemGroup" msprop:nullValue="미지정" msprop:Generator_ColumnPropNameInRow="ItemGroup" msprop:Generator_ColumnVarNameInTable="columnItemGroup" msprop:Generator_ColumnPropNameInTable="ItemGroupColumn" msprop:Generator_UserColumnName="ItemGroup" type="xs:string" minOccurs="0" />
@@ -440,7 +449,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_RowClassName="HolidayLIstRow" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent">
+        <xs:element name="HolidayLIst" msprop:Generator_TableClassName="HolidayLIstDataTable" msprop:Generator_TableVarName="tableHolidayLIst" msprop:Generator_TablePropName="HolidayLIst" msprop:Generator_RowDeletingName="HolidayLIstRowDeleting" msprop:Generator_RowChangingName="HolidayLIstRowChanging" msprop:Generator_RowEvHandlerName="HolidayLIstRowChangeEventHandler" msprop:Generator_RowDeletedName="HolidayLIstRowDeleted" msprop:Generator_UserTableName="HolidayLIst" msprop:Generator_RowChangedName="HolidayLIstRowChanged" msprop:Generator_RowEvArgName="HolidayLIstRowChangeEvent" msprop:Generator_RowClassName="HolidayLIstRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -470,7 +479,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="vJobReportForUser" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent" msprop:Generator_RowClassName="vJobReportForUserRow">
+        <xs:element name="vJobReportForUser" msprop:Generator_TableClassName="vJobReportForUserDataTable" msprop:Generator_TableVarName="tablevJobReportForUser" msprop:Generator_RowChangedName="vJobReportForUserRowChanged" msprop:Generator_TablePropName="vJobReportForUser" msprop:Generator_RowDeletingName="vJobReportForUserRowDeleting" msprop:Generator_RowChangingName="vJobReportForUserRowChanging" msprop:Generator_RowEvHandlerName="vJobReportForUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vJobReportForUserRowDeleted" msprop:Generator_RowClassName="vJobReportForUserRow" msprop:Generator_UserTableName="vJobReportForUser" msprop:Generator_RowEvArgName="vJobReportForUserRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="idx" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -587,7 +596,7 @@ ORDER BY pdate</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="K5DailyForm" msprop:Generator_TableClassName="K5DailyFormDataTable" msprop:Generator_TableVarName="tableK5DailyForm" msprop:Generator_RowChangedName="K5DailyFormRowChanged" msprop:Generator_TablePropName="K5DailyForm" msprop:Generator_RowDeletingName="K5DailyFormRowDeleting" msprop:Generator_RowChangingName="K5DailyFormRowChanging" msprop:Generator_RowEvHandlerName="K5DailyFormRowChangeEventHandler" msprop:Generator_RowDeletedName="K5DailyFormRowDeleted" msprop:Generator_RowClassName="K5DailyFormRow" msprop:Generator_UserTableName="K5DailyForm" msprop:Generator_RowEvArgName="K5DailyFormRowChangeEvent">
+        <xs:element name="K5DailyForm" msprop:Generator_TableClassName="K5DailyFormDataTable" msprop:Generator_TableVarName="tableK5DailyForm" msprop:Generator_TablePropName="K5DailyForm" msprop:Generator_RowDeletingName="K5DailyFormRowDeleting" msprop:Generator_RowChangingName="K5DailyFormRowChanging" msprop:Generator_RowEvHandlerName="K5DailyFormRowChangeEventHandler" msprop:Generator_RowDeletedName="K5DailyFormRowDeleted" msprop:Generator_UserTableName="K5DailyForm" msprop:Generator_RowChangedName="K5DailyFormRowChanged" msprop:Generator_RowEvArgName="K5DailyFormRowChangeEvent" msprop:Generator_RowClassName="K5DailyFormRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Grp" msprop:Generator_ColumnVarNameInTable="columnGrp" msprop:Generator_ColumnPropNameInRow="Grp" msprop:Generator_ColumnPropNameInTable="GrpColumn" msprop:Generator_UserColumnName="Grp" type="xs:string" />

SubProject/FPJ0000/dsReport.xss

@@ -4,14 +4,14 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="104" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="54" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:jobReport" ZOrder="1" X="70" Y="70" Height="419" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
+    <Shape ID="DesignTable:jobReport" ZOrder="2" X="494" Y="216" Height="419" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
-    <Shape ID="DesignTable:JobReportDay" ZOrder="3" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
+    <Shape ID="DesignTable:JobReportDay" ZOrder="1" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
     <Shape ID="DesignTable:ProcessList" ZOrder="8" X="587" Y="64" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignTable:ProcessUserList" ZOrder="7" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
     <Shape ID="DesignTable:HolidayLIst" ZOrder="5" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:vJobReportForUser" ZOrder="2" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:vJobReportForUser" ZOrder="3" X="118" Y="436" Height="305" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:PartSummary" ZOrder="6" X="852" Y="79" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="139" />
     <Shape ID="DesignTable:K5DailyForm" ZOrder="4" X="883" Y="539" Height="181" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" />
   </Shapes>