diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index 362c93d..4b82cd9 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -170,6 +170,9 @@ True dsQuery.xsd + + dsReport.xsd + True True diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs index 41bb214..b74ed5d 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs +++ b/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; diff --git a/SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs b/SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs index 64cadd2..fcb74ad 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportDay.Designer.cs +++ b/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"; diff --git a/SubProject/FPJ0000/JobReport_/rJobReportDay.cs b/SubProject/FPJ0000/JobReport_/rJobReportDay.cs index 6d7f800..acf4915 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportDay.cs +++ b/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('+'); diff --git a/SubProject/FPJ0000/JobReport_/rJobReportDay.resx b/SubProject/FPJ0000/JobReport_/rJobReportDay.resx index fad4171..c1a387b 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportDay.resx +++ b/SubProject/FPJ0000/JobReport_/rJobReportDay.resx @@ -136,41 +136,41 @@ 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 @@ -187,16 +187,16 @@ iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIPSURBVFhHYxgFtAKWPZYa5r3W5VTB/fYKUGOpByx7bUIt - +mz+U4ptJzn+N++1eWjSZ6MENZo6gFoOXH9l43+vGb7UdyS1HHjqyZn/Z5+epb4jqenAF19fUt+R1HYg - 1R1JCwdS1ZG0ciDVHElLByI70qLX+r7ZRHsZqLXEA2o5cOaxOf/XXVqPFfcfnPjfss/2P8guqLXEA2o5 - kBg86kBK8agDKcUj14G1W+v/Tz08HYw9pnvDxQvWFcPFQ+dFoOjBhmnmwKottf9hYOHJRWAxx8ku/999 - fQcWe/rh2X/biY4Y+tAxzRwIwuefXAA75tuvb+BQnHxoKpgPAiAPYNODjmnqwPglSf///vsLdtCSM8v+ - v/7yBsy+/OwyuJbApgcd09SBILzj+k6wo2DgHxAmLUvFqhYbprkD/WcHw0MRBPbe3IdVHS5McwdWbq6G - Og0Cnnx4SlTmgGGaOhDkkCfvn4AdBkt/IDD54FSs6rFhmjpwyqFpUCf9/1+2seL/2cfnwOyvP7/+957p - h1UPOqaZAz2m+/z//OML2EG3Xt0C59qsVblgPgisu7geqz50TDMHrr+4AeqU///LN1XBxc89Pg8WA2Wc - mEXxKHqwYZo5MHZx4v+EpclgjFzmec3wg4v7zApA0YMN08yB1MKjDqQUjzqQUjzqQEoxWQ606LXTBWru - oAsG2gW1dhRQGTAwAACtgPk32asT/QAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIESURBVFhH7ZXLK0RxFMfnD7GQlY2dmMkMTVnIu6QsyCsb + pZTyTLYWM6MxxnilPBcWM57FgkIpMt4lNpI78grFCMUxv+POzVw/NbnnZ+N+p0/de/qdez73dn93DHpE + xWQzxSfbUxpI6EiLlS9LF5PdXGh0mEErlk4rJNvMp4kOc5x8aZpQCfoOpiCzJ4dekkpwQ9oEf8BPL0kp + eBG8pJekFiSXFCFIKilKkExSpOBXSaMt5STJmRYjj40+VIK9awPg3fNx6Vh2gslhATZLHht9qASjQRfU + ii6olf8r2DrXBu5VD5LhyVLqtd46pV44WBTRw0OYYPNsK4QztD6MNasrHW6Dt1gL3J+DxWn91qdGmCBj + W9pBmafXJ3yKrhU3nrOwG+D1qBEqWDpaAW/vbyg0ujkO1483eLx/vo//ErweNUIFGfOHCygVznvoVzFe + xV3LQ7hgXn+B8hRZFo+WuOt+Qrhg00yLrPYZ6T4Q1eYII1SQiUh3EoqF3z8W17Kbu56HUMGulW5ZCaB+ + qhH8Z1t4HHwJQlZvLrdHjTDBDE82PDw/otDx1THu2uqJGjxn8e76uH1qhAn6didlFYCG6WalvnW2jTW2 + cYqHSyN6eAgTLBkph7KxSuTrNy+zJ1epZ/flR/TwECZIhS6oFV1QK7qgVn4laLSnJoSa2/+E0Cx5rB7i + GAwfCJT5L4+U6JYAAAAASUVORK5CYII= \ No newline at end of file diff --git a/SubProject/FPJ0000/dsReport.Designer.cs b/SubProject/FPJ0000/dsReport.Designer.cs index 9819fc3..028397f 100644 --- a/SubProject/FPJ0000/dsReport.Designer.cs +++ b/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; + } } /// @@ -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 diff --git a/SubProject/FPJ0000/dsReport.cs b/SubProject/FPJ0000/dsReport.cs new file mode 100644 index 0000000..20b7dad --- /dev/null +++ b/SubProject/FPJ0000/dsReport.cs @@ -0,0 +1,11 @@ +namespace FPJ0000 +{ + + + partial class dsReport + { + partial class JobReportDayDataTable + { + } + } +} diff --git a/SubProject/FPJ0000/dsReport.xsd b/SubProject/FPJ0000/dsReport.xsd index 49d53e7..f88e9e8 100644 --- a/SubProject/FPJ0000/dsReport.xsd +++ b/SubProject/FPJ0000/dsReport.xsd @@ -61,7 +61,8 @@ ORDER BY yymm - 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 + 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 + @@ -298,7 +300,7 @@ ORDER BY pdate - + @@ -338,10 +340,10 @@ ORDER BY pdate - + - + @@ -355,7 +357,7 @@ ORDER BY pdate - + @@ -371,10 +373,17 @@ ORDER BY pdate + + + + + + + - + @@ -387,7 +396,7 @@ ORDER BY pdate - + @@ -411,14 +420,14 @@ ORDER BY pdate - + - + @@ -428,7 +437,7 @@ ORDER BY pdate - + @@ -440,7 +449,7 @@ ORDER BY pdate - + @@ -470,7 +479,7 @@ ORDER BY pdate - + @@ -587,7 +596,7 @@ ORDER BY pdate - + diff --git a/SubProject/FPJ0000/dsReport.xss b/SubProject/FPJ0000/dsReport.xss index 8787789..a04ca4d 100644 --- a/SubProject/FPJ0000/dsReport.xss +++ b/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. --> - + - - + + - +