diff --git a/JobReportMailService/DataSet1.Designer.cs b/JobReportMailService/DataSet1.Designer.cs
index 83a3367..77b031c 100644
--- a/JobReportMailService/DataSet1.Designer.cs
+++ b/JobReportMailService/DataSet1.Designer.cs
@@ -32,6 +32,8 @@ namespace JobReportMailService {
private vMailingProjectScheduleDataTable tablevMailingProjectSchedule;
+ private vJobReportForUserDataTable tablevJobReportForUser;
+
private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -72,6 +74,9 @@ namespace JobReportMailService {
if ((ds.Tables["vMailingProjectSchedule"] != null)) {
base.Tables.Add(new vMailingProjectScheduleDataTable(ds.Tables["vMailingProjectSchedule"]));
}
+ if ((ds.Tables["vJobReportForUser"] != null)) {
+ base.Tables.Add(new vJobReportForUserDataTable(ds.Tables["vJobReportForUser"]));
+ }
this.DataSetName = ds.DataSetName;
this.Prefix = ds.Prefix;
this.Namespace = ds.Namespace;
@@ -130,6 +135,16 @@ namespace JobReportMailService {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ [global::System.ComponentModel.Browsable(false)]
+ [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
+ public vJobReportForUserDataTable vJobReportForUser {
+ get {
+ return this.tablevJobReportForUser;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.BrowsableAttribute(true)]
@@ -209,6 +224,9 @@ namespace JobReportMailService {
if ((ds.Tables["vMailingProjectSchedule"] != null)) {
base.Tables.Add(new vMailingProjectScheduleDataTable(ds.Tables["vMailingProjectSchedule"]));
}
+ if ((ds.Tables["vJobReportForUser"] != null)) {
+ base.Tables.Add(new vJobReportForUserDataTable(ds.Tables["vJobReportForUser"]));
+ }
this.DataSetName = ds.DataSetName;
this.Prefix = ds.Prefix;
this.Namespace = ds.Namespace;
@@ -266,6 +284,12 @@ namespace JobReportMailService {
this.tablevMailingProjectSchedule.InitVars();
}
}
+ this.tablevJobReportForUser = ((vJobReportForUserDataTable)(base.Tables["vJobReportForUser"]));
+ if ((initTable == true)) {
+ if ((this.tablevJobReportForUser != null)) {
+ this.tablevJobReportForUser.InitVars();
+ }
+ }
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -284,6 +308,8 @@ namespace JobReportMailService {
base.Tables.Add(this.tableMailForm);
this.tablevMailingProjectSchedule = new vMailingProjectScheduleDataTable();
base.Tables.Add(this.tablevMailingProjectSchedule);
+ this.tablevJobReportForUser = new vJobReportForUserDataTable();
+ base.Tables.Add(this.tablevJobReportForUser);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -310,6 +336,12 @@ namespace JobReportMailService {
return false;
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ private bool ShouldSerializevJobReportForUser() {
+ return false;
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) {
@@ -377,6 +409,9 @@ namespace JobReportMailService {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public delegate void vMailingProjectScheduleRowChangeEventHandler(object sender, vMailingProjectScheduleRowChangeEvent e);
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public delegate void vJobReportForUserRowChangeEventHandler(object sender, vJobReportForUserRowChangeEvent e);
+
///
///Represents the strongly named DataTable class.
///
@@ -2363,6 +2398,280 @@ namespace JobReportMailService {
}
}
+ ///
+ ///Represents the strongly named DataTable class.
+ ///
+ [global::System.Serializable()]
+ [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+ public partial class vJobReportForUserDataTable : global::System.Data.TypedTableBase {
+
+ private global::System.Data.DataColumn columnid;
+
+ private global::System.Data.DataColumn columnname;
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public vJobReportForUserDataTable() {
+ this.TableName = "vJobReportForUser";
+ this.BeginInit();
+ this.InitClass();
+ this.EndInit();
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ internal vJobReportForUserDataTable(global::System.Data.DataTable table) {
+ this.TableName = table.TableName;
+ if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
+ this.CaseSensitive = table.CaseSensitive;
+ }
+ if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {
+ this.Locale = table.Locale;
+ }
+ if ((table.Namespace != table.DataSet.Namespace)) {
+ this.Namespace = table.Namespace;
+ }
+ this.Prefix = table.Prefix;
+ this.MinimumCapacity = table.MinimumCapacity;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ protected vJobReportForUserDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) :
+ base(info, context) {
+ this.InitVars();
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public global::System.Data.DataColumn idColumn {
+ get {
+ return this.columnid;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public global::System.Data.DataColumn nameColumn {
+ get {
+ return this.columnname;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ [global::System.ComponentModel.Browsable(false)]
+ public int Count {
+ get {
+ return this.Rows.Count;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public vJobReportForUserRow this[int index] {
+ get {
+ return ((vJobReportForUserRow)(this.Rows[index]));
+ }
+ }
+
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public event vJobReportForUserRowChangeEventHandler vJobReportForUserRowChanging;
+
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public event vJobReportForUserRowChangeEventHandler vJobReportForUserRowChanged;
+
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public event vJobReportForUserRowChangeEventHandler vJobReportForUserRowDeleting;
+
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public event vJobReportForUserRowChangeEventHandler vJobReportForUserRowDeleted;
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public void AddvJobReportForUserRow(vJobReportForUserRow row) {
+ this.Rows.Add(row);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public vJobReportForUserRow AddvJobReportForUserRow(string id, string name) {
+ vJobReportForUserRow rowvJobReportForUserRow = ((vJobReportForUserRow)(this.NewRow()));
+ object[] columnValuesArray = new object[] {
+ id,
+ name};
+ rowvJobReportForUserRow.ItemArray = columnValuesArray;
+ this.Rows.Add(rowvJobReportForUserRow);
+ return rowvJobReportForUserRow;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public vJobReportForUserRow FindByid(string id) {
+ return ((vJobReportForUserRow)(this.Rows.Find(new object[] {
+ id})));
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public override global::System.Data.DataTable Clone() {
+ vJobReportForUserDataTable cln = ((vJobReportForUserDataTable)(base.Clone()));
+ cln.InitVars();
+ return cln;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ protected override global::System.Data.DataTable CreateInstance() {
+ return new vJobReportForUserDataTable();
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ internal void InitVars() {
+ this.columnid = base.Columns["id"];
+ this.columnname = base.Columns["name"];
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ private void InitClass() {
+ this.columnid = new global::System.Data.DataColumn("id", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnid);
+ this.columnname = new global::System.Data.DataColumn("name", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnname);
+ this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
+ this.columnid}, true));
+ this.columnid.AllowDBNull = false;
+ this.columnid.Unique = true;
+ this.columnid.MaxLength = 20;
+ this.columnname.MaxLength = 100;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public vJobReportForUserRow NewvJobReportForUserRow() {
+ return ((vJobReportForUserRow)(this.NewRow()));
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
+ return new vJobReportForUserRow(builder);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ protected override global::System.Type GetRowType() {
+ return typeof(vJobReportForUserRow);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
+ base.OnRowChanged(e);
+ if ((this.vJobReportForUserRowChanged != null)) {
+ this.vJobReportForUserRowChanged(this, new vJobReportForUserRowChangeEvent(((vJobReportForUserRow)(e.Row)), e.Action));
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
+ base.OnRowChanging(e);
+ if ((this.vJobReportForUserRowChanging != null)) {
+ this.vJobReportForUserRowChanging(this, new vJobReportForUserRowChangeEvent(((vJobReportForUserRow)(e.Row)), e.Action));
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
+ base.OnRowDeleted(e);
+ if ((this.vJobReportForUserRowDeleted != null)) {
+ this.vJobReportForUserRowDeleted(this, new vJobReportForUserRowChangeEvent(((vJobReportForUserRow)(e.Row)), e.Action));
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
+ base.OnRowDeleting(e);
+ if ((this.vJobReportForUserRowDeleting != null)) {
+ this.vJobReportForUserRowDeleting(this, new vJobReportForUserRowChangeEvent(((vJobReportForUserRow)(e.Row)), e.Action));
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public void RemovevJobReportForUserRow(vJobReportForUserRow row) {
+ this.Rows.Remove(row);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
+ global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
+ global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
+ DataSet1 ds = new DataSet1();
+ global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();
+ any1.Namespace = "http://www.w3.org/2001/XMLSchema";
+ any1.MinOccurs = new decimal(0);
+ any1.MaxOccurs = decimal.MaxValue;
+ any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+ sequence.Items.Add(any1);
+ global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();
+ any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
+ any2.MinOccurs = new decimal(1);
+ any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+ sequence.Items.Add(any2);
+ global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();
+ attribute1.Name = "namespace";
+ attribute1.FixedValue = ds.Namespace;
+ type.Attributes.Add(attribute1);
+ global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
+ attribute2.Name = "tableTypeName";
+ attribute2.FixedValue = "vJobReportForUserDataTable";
+ type.Attributes.Add(attribute2);
+ type.Particle = sequence;
+ global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
+ if (xs.Contains(dsSchema.TargetNamespace)) {
+ global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
+ global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
+ try {
+ global::System.Xml.Schema.XmlSchema schema = null;
+ dsSchema.Write(s1);
+ for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
+ schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
+ s2.SetLength(0);
+ schema.Write(s2);
+ if ((s1.Length == s2.Length)) {
+ s1.Position = 0;
+ s2.Position = 0;
+ for (; ((s1.Position != s1.Length)
+ && (s1.ReadByte() == s2.ReadByte())); ) {
+ ;
+ }
+ if ((s1.Position == s1.Length)) {
+ return type;
+ }
+ }
+ }
+ }
+ finally {
+ if ((s1 != null)) {
+ s1.Close();
+ }
+ if ((s2 != null)) {
+ s2.Close();
+ }
+ }
+ }
+ xs.Add(dsSchema);
+ return type;
+ }
+ }
+
///
///Represents strongly named DataRow class.
///
@@ -3943,6 +4252,60 @@ namespace JobReportMailService {
}
}
+ ///
+ ///Represents strongly named DataRow class.
+ ///
+ public partial class vJobReportForUserRow : global::System.Data.DataRow {
+
+ private vJobReportForUserDataTable tablevJobReportForUser;
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ internal vJobReportForUserRow(global::System.Data.DataRowBuilder rb) :
+ base(rb) {
+ this.tablevJobReportForUser = ((vJobReportForUserDataTable)(this.Table));
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public string id {
+ get {
+ return ((string)(this[this.tablevJobReportForUser.idColumn]));
+ }
+ set {
+ this[this.tablevJobReportForUser.idColumn] = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public string name {
+ get {
+ if (this.IsnameNull()) {
+ return string.Empty;
+ }
+ else {
+ return ((string)(this[this.tablevJobReportForUser.nameColumn]));
+ }
+ }
+ set {
+ this[this.tablevJobReportForUser.nameColumn] = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public bool IsnameNull() {
+ return this.IsNull(this.tablevJobReportForUser.nameColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public void SetnameNull() {
+ this[this.tablevJobReportForUser.nameColumn] = global::System.Convert.DBNull;
+ }
+ }
+
///
///Row event argument class
///
@@ -4078,6 +4441,40 @@ namespace JobReportMailService {
}
}
}
+
+ ///
+ ///Row event argument class
+ ///
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public class vJobReportForUserRowChangeEvent : global::System.EventArgs {
+
+ private vJobReportForUserRow eventRow;
+
+ private global::System.Data.DataRowAction eventAction;
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public vJobReportForUserRowChangeEvent(vJobReportForUserRow row, global::System.Data.DataRowAction action) {
+ this.eventRow = row;
+ this.eventAction = action;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public vJobReportForUserRow Row {
+ get {
+ return this.eventRow;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public global::System.Data.DataRowAction Action {
+ get {
+ return this.eventAction;
+ }
+ }
+ }
}
}
namespace JobReportMailService.DataSet1TableAdapters {
@@ -6575,6 +6972,188 @@ SELECT idx, gcode, cate, title, tolist, bcc, cc, subject, tail, body, selfTo, se
}
}
+ ///
+ ///Represents the connection and commands used to retrieve and save data.
+ ///
+ [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+ [global::System.ComponentModel.ToolboxItem(true)]
+ [global::System.ComponentModel.DataObjectAttribute(true)]
+ [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
+ ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ public partial class vJobReportForUserTableAdapter : global::System.ComponentModel.Component {
+
+ private global::System.Data.SqlClient.SqlDataAdapter _adapter;
+
+ private global::System.Data.SqlClient.SqlConnection _connection;
+
+ private global::System.Data.SqlClient.SqlTransaction _transaction;
+
+ private global::System.Data.SqlClient.SqlCommand[] _commandCollection;
+
+ private bool _clearBeforeFill;
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public vJobReportForUserTableAdapter() {
+ this.ClearBeforeFill = true;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter {
+ get {
+ if ((this._adapter == null)) {
+ this.InitAdapter();
+ }
+ return this._adapter;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ internal global::System.Data.SqlClient.SqlConnection Connection {
+ get {
+ if ((this._connection == null)) {
+ this.InitConnection();
+ }
+ return this._connection;
+ }
+ set {
+ this._connection = value;
+ if ((this.Adapter.InsertCommand != null)) {
+ this.Adapter.InsertCommand.Connection = value;
+ }
+ if ((this.Adapter.DeleteCommand != null)) {
+ this.Adapter.DeleteCommand.Connection = value;
+ }
+ if ((this.Adapter.UpdateCommand != null)) {
+ this.Adapter.UpdateCommand.Connection = value;
+ }
+ for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+ if ((this.CommandCollection[i] != null)) {
+ ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value;
+ }
+ }
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ internal global::System.Data.SqlClient.SqlTransaction Transaction {
+ get {
+ return this._transaction;
+ }
+ set {
+ this._transaction = value;
+ for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+ this.CommandCollection[i].Transaction = this._transaction;
+ }
+ if (((this.Adapter != null)
+ && (this.Adapter.DeleteCommand != null))) {
+ this.Adapter.DeleteCommand.Transaction = this._transaction;
+ }
+ if (((this.Adapter != null)
+ && (this.Adapter.InsertCommand != null))) {
+ this.Adapter.InsertCommand.Transaction = this._transaction;
+ }
+ if (((this.Adapter != null)
+ && (this.Adapter.UpdateCommand != null))) {
+ this.Adapter.UpdateCommand.Transaction = this._transaction;
+ }
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ protected global::System.Data.SqlClient.SqlCommand[] CommandCollection {
+ get {
+ if ((this._commandCollection == null)) {
+ this.InitCommandCollection();
+ }
+ return this._commandCollection;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public bool ClearBeforeFill {
+ get {
+ return this._clearBeforeFill;
+ }
+ set {
+ this._clearBeforeFill = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ private void InitAdapter() {
+ this._adapter = new global::System.Data.SqlClient.SqlDataAdapter();
+ global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
+ tableMapping.SourceTable = "Table";
+ tableMapping.DataSetTable = "vJobReportForUser";
+ tableMapping.ColumnMappings.Add("id", "id");
+ tableMapping.ColumnMappings.Add("name", "name");
+ this._adapter.TableMappings.Add(tableMapping);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ private void InitConnection() {
+ this._connection = new global::System.Data.SqlClient.SqlConnection();
+ this._connection.ConnectionString = global::JobReportMailService.Properties.Settings.Default.CS;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ private void InitCommandCollection() {
+ 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 id, MAX(name) AS name\r\nFROM vJobReportForUser\r\nWHERE (gcode = @gcode" +
+ ")\r\nGROUP BY id\r\nORDER BY name";
+ 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, "", "", ""));
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
+ public virtual int Fill(DataSet1.vJobReportForUserDataTable dataTable, string gcode) {
+ this.Adapter.SelectCommand = this.CommandCollection[0];
+ if ((gcode == null)) {
+ throw new global::System.ArgumentNullException("gcode");
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
+ }
+ if ((this.ClearBeforeFill == true)) {
+ dataTable.Clear();
+ }
+ int returnValue = this.Adapter.Fill(dataTable);
+ return returnValue;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+ [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
+ public virtual DataSet1.vJobReportForUserDataTable GetData(string gcode) {
+ this.Adapter.SelectCommand = this.CommandCollection[0];
+ if ((gcode == null)) {
+ throw new global::System.ArgumentNullException("gcode");
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
+ }
+ DataSet1.vJobReportForUserDataTable dataTable = new DataSet1.vJobReportForUserDataTable();
+ this.Adapter.Fill(dataTable);
+ return dataTable;
+ }
+ }
+
///
///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios
///
diff --git a/JobReportMailService/DataSet1.cs b/JobReportMailService/DataSet1.cs
index 6a41e6a..6476687 100644
--- a/JobReportMailService/DataSet1.cs
+++ b/JobReportMailService/DataSet1.cs
@@ -2,6 +2,14 @@
{
}
+namespace JobReportMailService
+{
+}
+
+namespace JobReportMailService
+{
+}
+
namespace JobReportMailService
{
}
\ No newline at end of file
diff --git a/JobReportMailService/DataSet1.xsd b/JobReportMailService/DataSet1.xsd
index 9599f18..f04b023 100644
--- a/JobReportMailService/DataSet1.xsd
+++ b/JobReportMailService/DataSet1.xsd
@@ -458,6 +458,29 @@ ORDER BY pdate, idx, seq
+
+
+
+
+
+ SELECT id, MAX(name) AS name
+FROM vJobReportForUser
+WHERE (gcode = @gcode)
+GROUP BY id
+ORDER BY name
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -818,6 +841,26 @@ ORDER BY pdate, idx, seq
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -837,5 +880,9 @@ ORDER BY pdate, idx, seq
+
+
+
+
\ No newline at end of file
diff --git a/JobReportMailService/DataSet1.xss b/JobReportMailService/DataSet1.xss
index ecc6c28..42ed1f0 100644
--- a/JobReportMailService/DataSet1.xss
+++ b/JobReportMailService/DataSet1.xss
@@ -6,10 +6,11 @@
-->
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/JobReportMailService/EETGW_ProjectToDo.cs b/JobReportMailService/EETGW_ProjectToDo.cs
index da679ae..26c1b6c 100644
--- a/JobReportMailService/EETGW_ProjectToDo.cs
+++ b/JobReportMailService/EETGW_ProjectToDo.cs
@@ -29,5 +29,7 @@ namespace JobReportMailService
public string remark2 { get; set; }
public string wuid { get; set; }
public System.DateTime wdate { get; set; }
+ public string gcode { get; set; }
+ public Nullable no { get; set; }
}
}
diff --git a/JobReportMailService/EETGW_ProjectsSchedule.cs b/JobReportMailService/EETGW_ProjectsSchedule.cs
index d2ccf3f..632317a 100644
--- a/JobReportMailService/EETGW_ProjectsSchedule.cs
+++ b/JobReportMailService/EETGW_ProjectsSchedule.cs
@@ -20,10 +20,11 @@ namespace JobReportMailService
public Nullable no { get; set; }
public Nullable seq { get; set; }
public string title { get; set; }
- public Nullable sw { get; set; }
- public Nullable ew { get; set; }
- public Nullable swa { get; set; }
- public Nullable ewa { get; set; }
+ public string cate { get; set; }
+ public string sw { get; set; }
+ public string ew { get; set; }
+ public string swa { get; set; }
+ public string ewa { get; set; }
public string uid { get; set; }
public string memo { get; set; }
public Nullable appoval { get; set; }
diff --git a/JobReportMailService/JobReport.cs b/JobReportMailService/JobReport.cs
index 62b257d..f7fa889 100644
--- a/JobReportMailService/JobReport.cs
+++ b/JobReportMailService/JobReport.cs
@@ -35,5 +35,14 @@ namespace JobReportMailService
public string description2 { get; set; }
public string tag { get; set; }
public Nullable autoinput { get; set; }
+ public Nullable otStart { get; set; }
+ public Nullable otEnd { get; set; }
+ public string kisullv { get; set; }
+ public string kisuldiv { get; set; }
+ public Nullable kisulamt { get; set; }
+ public Nullable ot2 { get; set; }
+ public string otReason { get; set; }
+ public string otwuid { get; set; }
+ public Nullable ottime { get; set; }
}
}
diff --git a/JobReportMailService/Model1.Context.cs b/JobReportMailService/Model1.Context.cs
index 6d75ec5..e8f97ca 100644
--- a/JobReportMailService/Model1.Context.cs
+++ b/JobReportMailService/Model1.Context.cs
@@ -28,11 +28,11 @@ namespace JobReportMailService
public virtual DbSet JobReport { get; set; }
public virtual DbSet MailData { get; set; }
public virtual DbSet vGroupUser { get; set; }
- public virtual DbSet vJobReportForUser { get; set; }
public virtual DbSet HolidayLIst { get; set; }
public virtual DbSet MailForm { get; set; }
public virtual DbSet EETGW_ProjectToDo { get; set; }
public virtual DbSet Projects { get; set; }
public virtual DbSet EETGW_ProjectsSchedule { get; set; }
+ public virtual DbSet vJobReportForUser { get; set; }
}
}
diff --git a/JobReportMailService/Model1.edmx b/JobReportMailService/Model1.edmx
index 911190c..b092f70 100644
--- a/JobReportMailService/Model1.edmx
+++ b/JobReportMailService/Model1.edmx
@@ -15,10 +15,11 @@
-
-
-
-
+
+
+
+
+
@@ -31,8 +32,10 @@
+
+
@@ -76,12 +79,21 @@
+
+
+
+
+
+
+
+
+
@@ -171,9 +183,12 @@
+
+
+
@@ -182,12 +197,14 @@
+
+
@@ -205,11 +222,12 @@
-
+
+
@@ -217,24 +235,34 @@
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
@@ -266,7 +294,8 @@
[vGroupUser].[id] AS [id],
[vGroupUser].[state] AS [state],
[vGroupUser].[useJobReport] AS [useJobReport],
- [vGroupUser].[useUserState] AS [useUserState]
+ [vGroupUser].[useUserState] AS [useUserState],
+ [vGroupUser].[password] AS [password]
FROM [dbo].[vGroupUser] AS [vGroupUser]
@@ -287,7 +316,14 @@
[vJobReportForUser].[status] AS [status],
[vJobReportForUser].[projectName] AS [projectName],
[vJobReportForUser].[description] AS [description],
- [vJobReportForUser].[ww] AS [ww]
+ [vJobReportForUser].[ww] AS [ww],
+ [vJobReportForUser].[otStart] AS [otStart],
+ [vJobReportForUser].[otEnd] AS [otEnd],
+ [vJobReportForUser].[ot2] AS [ot2],
+ [vJobReportForUser].[otReason] AS [otReason],
+ [vJobReportForUser].[grade] AS [grade],
+ [vJobReportForUser].[indate] AS [indate],
+ [vJobReportForUser].[outdate] AS [outdate]
FROM [dbo].[vJobReportForUser] AS [vJobReportForUser]
@@ -320,6 +356,15 @@
+
+
+
+
+
+
+
+
+
@@ -363,45 +408,23 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -455,6 +478,8 @@
+
+
@@ -511,6 +536,10 @@
+
+
+
+
@@ -522,10 +551,11 @@
-
-
-
-
+
+
+
+
+
@@ -533,6 +563,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -542,6 +605,15 @@
+
+
+
+
+
+
+
+
+
@@ -592,6 +664,7 @@
+
@@ -616,29 +689,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -677,6 +727,8 @@
+
+
@@ -698,6 +750,10 @@
+
+
+
+
@@ -765,6 +821,7 @@
+
@@ -774,6 +831,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/JobReportMailService/Model1.edmx.diagram b/JobReportMailService/Model1.edmx.diagram
index b20655d..3b5c557 100644
--- a/JobReportMailService/Model1.edmx.diagram
+++ b/JobReportMailService/Model1.edmx.diagram
@@ -8,12 +8,12 @@
-
-
+
+
diff --git a/JobReportMailService/Projects.cs b/JobReportMailService/Projects.cs
index 093eec2..01731e4 100644
--- a/JobReportMailService/Projects.cs
+++ b/JobReportMailService/Projects.cs
@@ -65,5 +65,9 @@ namespace JobReportMailService
public Nullable EB_RepairTime { get; set; }
public Nullable EB_ConstNew { get; set; }
public string EB_BoardName { get; set; }
+ public string CMP_After2 { get; set; }
+ public string model { get; set; }
+ public string serial { get; set; }
+ public Nullable bAlert { get; set; }
}
}
diff --git a/JobReportMailService/fJobReportDay.cs b/JobReportMailService/fJobReportDay.cs
index 2350df8..7c5e5b9 100644
--- a/JobReportMailService/fJobReportDay.cs
+++ b/JobReportMailService/fJobReportDay.cs
@@ -127,12 +127,18 @@ namespace JobReportMailService
//대상 사용자 목록을 추출한다
db = new EEEntities();
- var users = db.vJobReportForUser.Where(t => t.gcode == vGcode).GroupBy(t => t.id);
+ // db.Database.CommandTimeout = 10000;
+ var taUser = new DataSet1TableAdapters.vJobReportForUserTableAdapter();
+ var users = taUser.GetData(vGcode);
+ taUser.Dispose();
+
+ //var users = db.vJobReportForUser.Where(t => t.gcode == vGcode).GroupBy(t => t.id);
+
Dictionary uids = new Dictionary();
- foreach (var user in users)
+ foreach (var userinfo in users)
{
//해당 사용자의 오늘 날짜로 등록된 자동 데이터가 있다면 대상에 넣지 않는다
- var userinfo = user.FirstOrDefault();
+ //var userinfo = user.FirstOrDefault();
if (userinfo == null || string.IsNullOrEmpty(userinfo.id) == true) continue;
//퇴사자 확인
@@ -186,7 +192,7 @@ namespace JobReportMailService
//이사용자의 날짜별 근무시간을 확인한다.
db = new EEEntities();
- var UserDatas = db.vJobReportForUser.Where(t => t.gcode == vGcode && t.id == uid.Key && t.pdate.CompareTo(str_sd) >= 0 && t.pdate.CompareTo(str_ed) < 0).ToList();
+ var UserDatas = db.JobReport.Where(t => t.gcode == vGcode && t.uid == uid.Key && t.pdate.CompareTo(str_sd) >= 0 && t.pdate.CompareTo(str_ed) < 0).ToList();
Dictionary WarnList = new Dictionary();
foreach (var dt in days.OrderBy(t => t))
diff --git a/JobReportMailService/vGroupUser.cs b/JobReportMailService/vGroupUser.cs
index 141ee3c..d2c7675 100644
--- a/JobReportMailService/vGroupUser.cs
+++ b/JobReportMailService/vGroupUser.cs
@@ -35,5 +35,6 @@ namespace JobReportMailService
public string state { get; set; }
public Nullable useJobReport { get; set; }
public Nullable useUserState { get; set; }
+ public string password { get; set; }
}
}
diff --git a/JobReportMailService/vJobReportForUser.cs b/JobReportMailService/vJobReportForUser.cs
index aa762e1..46effcc 100644
--- a/JobReportMailService/vJobReportForUser.cs
+++ b/JobReportMailService/vJobReportForUser.cs
@@ -24,12 +24,19 @@ namespace JobReportMailService
public string svalue { get; set; }
public Nullable hrs { get; set; }
public Nullable ot { get; set; }
- public string userProcess { get; set; }
public string requestpart { get; set; }
public string package { get; set; }
+ public string userProcess { get; set; }
public string status { get; set; }
public string projectName { get; set; }
public string description { get; set; }
public string ww { get; set; }
+ public Nullable otStart { get; set; }
+ public Nullable otEnd { get; set; }
+ public Nullable ot2 { get; set; }
+ public string otReason { get; set; }
+ public string grade { get; set; }
+ public string indate { get; set; }
+ public string outdate { get; set; }
}
}