Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

..

Browse Source
This commit is contained in:
chi
2022-12-16 15:06:45 +09:00
parent 146f32c64e
commit 6ea52f61be
12 changed files with 1776 additions and 1540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
SubProject/FPJ0000/dsReport.Designer.cs generated
View File

@@ -2800,6 +2800,10 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnidx;
private global::System.Data.DataColumn columnPrjStatus;
private global::System.Data.DataColumn columnPrjName;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public JobProjectTimesDataTable() {
@@ -2873,6 +2877,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn PrjStatusColumn {
get {
return this.columnPrjStatus;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn PrjNameColumn {
get {
return this.columnPrjName;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -2910,14 +2930,16 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public JobProjectTimesRow AddJobProjectTimesRow(string ww, int pidx, string title, double hrs, int idx) {
public JobProjectTimesRow AddJobProjectTimesRow(string ww, int pidx, string title, double hrs, int idx, string PrjStatus, string PrjName) {
JobProjectTimesRow rowJobProjectTimesRow = ((JobProjectTimesRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
ww,
pidx,
title,
hrs,
idx};
idx,
PrjStatus,
PrjName};
rowJobProjectTimesRow.ItemArray = columnValuesArray;
this.Rows.Add(rowJobProjectTimesRow);
return rowJobProjectTimesRow;
@@ -2952,6 +2974,8 @@ namespace FPJ0000 {
this.columntitle = base.Columns["title"];
this.columnhrs = base.Columns["hrs"];
this.columnidx = base.Columns["idx"];
this.columnPrjStatus = base.Columns["PrjStatus"];
this.columnPrjName = base.Columns["PrjName"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2967,6 +2991,10 @@ namespace FPJ0000 {
base.Columns.Add(this.columnhrs);
this.columnidx = new global::System.Data.DataColumn("idx", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnidx);
this.columnPrjStatus = new global::System.Data.DataColumn("PrjStatus", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnPrjStatus);
this.columnPrjName = new global::System.Data.DataColumn("PrjName", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnPrjName);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnww.ReadOnly = true;
@@ -2978,6 +3006,8 @@ namespace FPJ0000 {
this.columnidx.AllowDBNull = false;
this.columnidx.ReadOnly = true;
this.columnidx.Unique = true;
this.columnPrjStatus.MaxLength = 50;
this.columnPrjName.MaxLength = 255;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -5181,6 +5211,38 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string PrjStatus {
get {
if (this.IsPrjStatusNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableJobProjectTimes.PrjStatusColumn]));
}
}
set {
this[this.tableJobProjectTimes.PrjStatusColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string PrjName {
get {
if (this.IsPrjNameNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableJobProjectTimes.PrjNameColumn]));
}
}
set {
this[this.tableJobProjectTimes.PrjNameColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IswwNull() {
@@ -5228,6 +5290,30 @@ namespace FPJ0000 {
public void SethrsNull() {
this[this.tableJobProjectTimes.hrsColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsPrjStatusNull() {
return this.IsNull(this.tableJobProjectTimes.PrjStatusColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetPrjStatusNull() {
this[this.tableJobProjectTimes.PrjStatusColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsPrjNameNull() {
return this.IsNull(this.tableJobProjectTimes.PrjNameColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetPrjNameNull() {
this[this.tableJobProjectTimes.PrjNameColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -7761,6 +7847,8 @@ ORDER BY pdate";
tableMapping.ColumnMappings.Add("title", "title");
tableMapping.ColumnMappings.Add("hrs", "hrs");
tableMapping.ColumnMappings.Add("idx", "idx");
tableMapping.ColumnMappings.Add("PrjStatus", "PrjStatus");
tableMapping.ColumnMappings.Add("PrjName", "PrjName");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -7777,10 +7865,12 @@ ORDER BY pdate";
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 MAX(idx) AS idx, dbo.getWorkWeek(pdate) AS ww, ISNULL(pidx, 0) AS pidx, MAX(projectName) AS title, ISNULL(SUM(hrs), 0) AS hrs
FROM JobReport
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (uid = @uid) AND (ISNULL(hrs, 0) > 0)
GROUP BY dbo.getWorkWeek(pdate), ISNULL(pidx, 0)
this._commandCollection[0].CommandText = @"SELECT MAX(JobReport.idx) AS idx, dbo.getWorkWeek(JobReport.pdate) AS ww, ISNULL(JobReport.pidx, 0) AS pidx, MAX(JobReport.projectName) AS title, ISNULL(SUM(JobReport.hrs), 0) AS hrs,
Projects.status AS PrjStatus, Projects.name AS PrjName
FROM JobReport LEFT OUTER JOIN
Projects ON JobReport.pidx = Projects.idx AND JobReport.gcode = Projects.gcode
WHERE (JobReport.gcode = @gcode) AND (JobReport.pdate BETWEEN @sd AND @ed) AND (JobReport.uid = @uid) AND (ISNULL(JobReport.hrs, 0) > 0)
GROUP BY dbo.getWorkWeek(JobReport.pdate), ISNULL(JobReport.pidx, 0), Projects.name, Projects.status
ORDER BY title, ww";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));