extra settings
This commit is contained in:
Luc
parent
7aead07211
commit
030b3f8da2
8 changed files with 672 additions and 35 deletions
|
|
@ -3,7 +3,7 @@
|
|||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
|
||||
<?define eDosStation_TargetDir=$(var.eDosStation.TargetDir)?>
|
||||
<?define syncEdosLocal_TargetDir=$(var.syncEdosLocal.TargetDir)?>
|
||||
<Product Id="*" Name="eDosStation" Language="1033" Version="1.3.0.0" Manufacturer="SCK CEN Luc Vandenbroucke" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8">
|
||||
<Product Id="*" Name="eDosStation" Language="1033" Version="1.3.1.0" Manufacturer="SCK CEN Luc Vandenbroucke" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8">
|
||||
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Comments="EPD lees software en synchronisatie tussen local en remote database" InstallPrivileges="elevated" Platform="x86" />
|
||||
<Media Id="1" EmbedCab="yes" Cabinet="cab" />
|
||||
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
|
||||
|
|
|
|||
555
eDosStation/DataSet1.Designer.cs
generated
555
eDosStation/DataSet1.Designer.cs
generated
|
|
@ -30,6 +30,8 @@ namespace eDosStation {
|
|||
|
||||
private CommentOnEventDataTable tableCommentOnEvent;
|
||||
|
||||
private InstallationDataTable tableInstallation;
|
||||
|
||||
private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
|
|
@ -67,6 +69,9 @@ namespace eDosStation {
|
|||
if ((ds.Tables["CommentOnEvent"] != null)) {
|
||||
base.Tables.Add(new CommentOnEventDataTable(ds.Tables["CommentOnEvent"]));
|
||||
}
|
||||
if ((ds.Tables["Installation"] != null)) {
|
||||
base.Tables.Add(new InstallationDataTable(ds.Tables["Installation"]));
|
||||
}
|
||||
this.DataSetName = ds.DataSetName;
|
||||
this.Prefix = ds.Prefix;
|
||||
this.Namespace = ds.Namespace;
|
||||
|
|
@ -115,6 +120,16 @@ namespace eDosStation {
|
|||
}
|
||||
}
|
||||
|
||||
[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 InstallationDataTable Installation {
|
||||
get {
|
||||
return this.tableInstallation;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
[global::System.ComponentModel.BrowsableAttribute(true)]
|
||||
|
|
@ -191,6 +206,9 @@ namespace eDosStation {
|
|||
if ((ds.Tables["CommentOnEvent"] != null)) {
|
||||
base.Tables.Add(new CommentOnEventDataTable(ds.Tables["CommentOnEvent"]));
|
||||
}
|
||||
if ((ds.Tables["Installation"] != null)) {
|
||||
base.Tables.Add(new InstallationDataTable(ds.Tables["Installation"]));
|
||||
}
|
||||
this.DataSetName = ds.DataSetName;
|
||||
this.Prefix = ds.Prefix;
|
||||
this.Namespace = ds.Namespace;
|
||||
|
|
@ -242,6 +260,12 @@ namespace eDosStation {
|
|||
this.tableCommentOnEvent.InitVars();
|
||||
}
|
||||
}
|
||||
this.tableInstallation = ((InstallationDataTable)(base.Tables["Installation"]));
|
||||
if ((initTable == true)) {
|
||||
if ((this.tableInstallation != null)) {
|
||||
this.tableInstallation.InitVars();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
|
|
@ -258,6 +282,8 @@ namespace eDosStation {
|
|||
base.Tables.Add(this.tableGetTaskList);
|
||||
this.tableCommentOnEvent = new CommentOnEventDataTable();
|
||||
base.Tables.Add(this.tableCommentOnEvent);
|
||||
this.tableInstallation = new InstallationDataTable();
|
||||
base.Tables.Add(this.tableInstallation);
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
|
|
@ -278,6 +304,12 @@ namespace eDosStation {
|
|||
return false;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
private bool ShouldSerializeInstallation() {
|
||||
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) {
|
||||
|
|
@ -342,6 +374,9 @@ namespace eDosStation {
|
|||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public delegate void CommentOnEventRowChangeEventHandler(object sender, CommentOnEventRowChangeEvent e);
|
||||
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public delegate void InstallationRowChangeEventHandler(object sender, InstallationRowChangeEvent e);
|
||||
|
||||
/// <summary>
|
||||
///Represents the strongly named DataTable class.
|
||||
///</summary>
|
||||
|
|
@ -1677,6 +1712,269 @@ namespace eDosStation {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///Represents the strongly named DataTable class.
|
||||
///</summary>
|
||||
[global::System.Serializable()]
|
||||
[global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
|
||||
public partial class InstallationDataTable : global::System.Data.TypedTableBase<InstallationRow> {
|
||||
|
||||
private global::System.Data.DataColumn columnInst_CODE;
|
||||
|
||||
private global::System.Data.DataColumn columnInstallationName;
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public InstallationDataTable() {
|
||||
this.TableName = "Installation";
|
||||
this.BeginInit();
|
||||
this.InitClass();
|
||||
this.EndInit();
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
internal InstallationDataTable(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 InstallationDataTable(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 Inst_CODEColumn {
|
||||
get {
|
||||
return this.columnInst_CODE;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public global::System.Data.DataColumn InstallationNameColumn {
|
||||
get {
|
||||
return this.columnInstallationName;
|
||||
}
|
||||
}
|
||||
|
||||
[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 InstallationRow this[int index] {
|
||||
get {
|
||||
return ((InstallationRow)(this.Rows[index]));
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public event InstallationRowChangeEventHandler InstallationRowChanging;
|
||||
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public event InstallationRowChangeEventHandler InstallationRowChanged;
|
||||
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public event InstallationRowChangeEventHandler InstallationRowDeleting;
|
||||
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public event InstallationRowChangeEventHandler InstallationRowDeleted;
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public void AddInstallationRow(InstallationRow row) {
|
||||
this.Rows.Add(row);
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public InstallationRow AddInstallationRow(int Inst_CODE, string InstallationName) {
|
||||
InstallationRow rowInstallationRow = ((InstallationRow)(this.NewRow()));
|
||||
object[] columnValuesArray = new object[] {
|
||||
Inst_CODE,
|
||||
InstallationName};
|
||||
rowInstallationRow.ItemArray = columnValuesArray;
|
||||
this.Rows.Add(rowInstallationRow);
|
||||
return rowInstallationRow;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public override global::System.Data.DataTable Clone() {
|
||||
InstallationDataTable cln = ((InstallationDataTable)(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 InstallationDataTable();
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
internal void InitVars() {
|
||||
this.columnInst_CODE = base.Columns["Inst_CODE"];
|
||||
this.columnInstallationName = base.Columns["InstallationName"];
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
private void InitClass() {
|
||||
this.columnInst_CODE = new global::System.Data.DataColumn("Inst_CODE", typeof(int), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnInst_CODE);
|
||||
this.columnInstallationName = new global::System.Data.DataColumn("InstallationName", typeof(string), null, global::System.Data.MappingType.Element);
|
||||
base.Columns.Add(this.columnInstallationName);
|
||||
this.columnInst_CODE.AllowDBNull = false;
|
||||
this.columnInstallationName.MaxLength = 50;
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public InstallationRow NewInstallationRow() {
|
||||
return ((InstallationRow)(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 InstallationRow(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(InstallationRow);
|
||||
}
|
||||
|
||||
[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.InstallationRowChanged != null)) {
|
||||
this.InstallationRowChanged(this, new InstallationRowChangeEvent(((InstallationRow)(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.InstallationRowChanging != null)) {
|
||||
this.InstallationRowChanging(this, new InstallationRowChangeEvent(((InstallationRow)(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.InstallationRowDeleted != null)) {
|
||||
this.InstallationRowDeleted(this, new InstallationRowChangeEvent(((InstallationRow)(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.InstallationRowDeleting != null)) {
|
||||
this.InstallationRowDeleting(this, new InstallationRowChangeEvent(((InstallationRow)(e.Row)), e.Action));
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public void RemoveInstallationRow(InstallationRow 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 = "InstallationDataTable";
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///Represents strongly named DataRow class.
|
||||
///</summary>
|
||||
|
|
@ -2695,6 +2993,60 @@ namespace eDosStation {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///Represents strongly named DataRow class.
|
||||
///</summary>
|
||||
public partial class InstallationRow : global::System.Data.DataRow {
|
||||
|
||||
private InstallationDataTable tableInstallation;
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
internal InstallationRow(global::System.Data.DataRowBuilder rb) :
|
||||
base(rb) {
|
||||
this.tableInstallation = ((InstallationDataTable)(this.Table));
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public int Inst_CODE {
|
||||
get {
|
||||
return ((int)(this[this.tableInstallation.Inst_CODEColumn]));
|
||||
}
|
||||
set {
|
||||
this[this.tableInstallation.Inst_CODEColumn] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public string InstallationName {
|
||||
get {
|
||||
try {
|
||||
return ((string)(this[this.tableInstallation.InstallationNameColumn]));
|
||||
}
|
||||
catch (global::System.InvalidCastException e) {
|
||||
throw new global::System.Data.StrongTypingException("The value for column \'InstallationName\' in table \'Installation\' is DBNull.", e);
|
||||
}
|
||||
}
|
||||
set {
|
||||
this[this.tableInstallation.InstallationNameColumn] = value;
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public bool IsInstallationNameNull() {
|
||||
return this.IsNull(this.tableInstallation.InstallationNameColumn);
|
||||
}
|
||||
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public void SetInstallationNameNull() {
|
||||
this[this.tableInstallation.InstallationNameColumn] = global::System.Convert.DBNull;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///Row event argument class
|
||||
///</summary>
|
||||
|
|
@ -2796,6 +3148,40 @@ namespace eDosStation {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///Row event argument class
|
||||
///</summary>
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
|
||||
public class InstallationRowChangeEvent : global::System.EventArgs {
|
||||
|
||||
private InstallationRow 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 InstallationRowChangeEvent(InstallationRow 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 InstallationRow 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 eDosStation.DataSet1TableAdapters {
|
||||
|
|
@ -3367,6 +3753,175 @@ namespace eDosStation.DataSet1TableAdapters {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///Represents the connection and commands used to retrieve and save data.
|
||||
///</summary>
|
||||
[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 InstallationTableAdapter : 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 InstallationTableAdapter() {
|
||||
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 = "Installation";
|
||||
tableMapping.ColumnMappings.Add("Inst_CODE", "Inst_CODE");
|
||||
tableMapping.ColumnMappings.Add("InstallationName", "InstallationName");
|
||||
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::eDosStation.Properties.Settings.Default.localConnectionString;
|
||||
}
|
||||
|
||||
[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 [Inst_CODE] ,[InstallationName]\r\n FROM [eDosLocal].[dbo].[Installation" +
|
||||
"] order by [InstallationName]";
|
||||
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
|
||||
}
|
||||
|
||||
[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.InstallationDataTable dataTable) {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[0];
|
||||
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.InstallationDataTable GetData() {
|
||||
this.Adapter.SelectCommand = this.CommandCollection[0];
|
||||
DataSet1.InstallationDataTable dataTable = new DataSet1.InstallationDataTable();
|
||||
this.Adapter.Fill(dataTable);
|
||||
return dataTable;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios
|
||||
///</summary>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
|
||||
<DataSource DefaultConnectionIndex="1" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
|
||||
<Connections>
|
||||
<Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="eDosConnectionString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="eDosConnectionString (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.eDosStation.Properties.Settings.GlobalReference.Default.eDosConnectionString" Provider="System.Data.SqlClient" />
|
||||
<Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="eDosConnectionString" IsAppSettingsProperty="true" Modifier="Assembly" Name="eDosConnectionString (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.eDosStation.Properties.Settings.GlobalReference.Default.eDosConnectionString" Provider="System.Data.SqlClient" />
|
||||
<Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="localConnectionString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="localConnectionString (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.eDosStation.Properties.Settings.GlobalReference.Default.localConnectionString" Provider="System.Data.SqlClient" />
|
||||
</Connections>
|
||||
<Tables>
|
||||
|
|
@ -100,6 +100,24 @@
|
|||
</Mappings>
|
||||
<Sources />
|
||||
</TableAdapter>
|
||||
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="InstallationTableAdapter" GeneratorDataComponentClassName="InstallationTableAdapter" Name="Installation" UserDataComponentName="InstallationTableAdapter">
|
||||
<MainSource>
|
||||
<DbSource ConnectionRef="localConnectionString (Settings)" DbObjectName="eDosLocal.dbo.Installation" DbObjectType="Table" 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="false" UserGetMethodName="GetData" UserSourceName="Fill">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>SELECT [Inst_CODE] ,[InstallationName]
|
||||
FROM [eDosLocal].[dbo].[Installation] order by [InstallationName]</CommandText>
|
||||
<Parameters />
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
</DbSource>
|
||||
</MainSource>
|
||||
<Mappings>
|
||||
<Mapping SourceColumn="Inst_CODE" DataSetColumn="Inst_CODE" />
|
||||
<Mapping SourceColumn="InstallationName" DataSetColumn="InstallationName" />
|
||||
</Mappings>
|
||||
<Sources />
|
||||
</TableAdapter>
|
||||
</Tables>
|
||||
<Sources />
|
||||
</DataSource>
|
||||
|
|
@ -108,7 +126,7 @@
|
|||
<xs:element name="DataSet1" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DataSet1" msprop:Generator_UserDSName="DataSet1">
|
||||
<xs:complexType>
|
||||
<xs:choice minOccurs="0" maxOccurs="unbounded">
|
||||
<xs:element name="GetTaskInfo" msprop:Generator_TableClassName="GetTaskInfoDataTable" msprop:Generator_TableVarName="tableGetTaskInfo" msprop:Generator_RowChangedName="GetTaskInfoRowChanged" msprop:Generator_TablePropName="GetTaskInfo" msprop:Generator_RowDeletingName="GetTaskInfoRowDeleting" msprop:Generator_RowChangingName="GetTaskInfoRowChanging" msprop:Generator_RowEvHandlerName="GetTaskInfoRowChangeEventHandler" msprop:Generator_RowDeletedName="GetTaskInfoRowDeleted" msprop:Generator_RowClassName="GetTaskInfoRow" msprop:Generator_UserTableName="GetTaskInfo" msprop:Generator_RowEvArgName="GetTaskInfoRowChangeEvent">
|
||||
<xs:element name="GetTaskInfo" msprop:Generator_TableClassName="GetTaskInfoDataTable" msprop:Generator_TableVarName="tableGetTaskInfo" msprop:Generator_TablePropName="GetTaskInfo" msprop:Generator_RowDeletingName="GetTaskInfoRowDeleting" msprop:Generator_RowChangingName="GetTaskInfoRowChanging" msprop:Generator_RowEvHandlerName="GetTaskInfoRowChangeEventHandler" msprop:Generator_RowDeletedName="GetTaskInfoRowDeleted" msprop:Generator_UserTableName="GetTaskInfo" msprop:Generator_RowChangedName="GetTaskInfoRowChanged" msprop:Generator_RowEvArgName="GetTaskInfoRowChangeEvent" msprop:Generator_RowClassName="GetTaskInfoRow">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="ID_Task" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnID_Task" msprop:Generator_ColumnPropNameInRow="ID_Task" msprop:Generator_ColumnPropNameInTable="ID_TaskColumn" msprop:Generator_UserColumnName="ID_Task" type="xs:int" />
|
||||
|
|
@ -170,7 +188,7 @@
|
|||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="GetTaskList" msprop:Generator_TableClassName="GetTaskListDataTable" msprop:Generator_TableVarName="tableGetTaskList" msprop:Generator_RowChangedName="GetTaskListRowChanged" msprop:Generator_TablePropName="GetTaskList" msprop:Generator_RowDeletingName="GetTaskListRowDeleting" msprop:Generator_RowChangingName="GetTaskListRowChanging" msprop:Generator_RowEvHandlerName="GetTaskListRowChangeEventHandler" msprop:Generator_RowDeletedName="GetTaskListRowDeleted" msprop:Generator_RowClassName="GetTaskListRow" msprop:Generator_UserTableName="GetTaskList" msprop:Generator_RowEvArgName="GetTaskListRowChangeEvent">
|
||||
<xs:element name="GetTaskList" msprop:Generator_TableClassName="GetTaskListDataTable" msprop:Generator_TableVarName="tableGetTaskList" msprop:Generator_TablePropName="GetTaskList" msprop:Generator_RowDeletingName="GetTaskListRowDeleting" msprop:Generator_RowChangingName="GetTaskListRowChanging" msprop:Generator_RowEvHandlerName="GetTaskListRowChangeEventHandler" msprop:Generator_RowDeletedName="GetTaskListRowDeleted" msprop:Generator_UserTableName="GetTaskList" msprop:Generator_RowChangedName="GetTaskListRowChanged" msprop:Generator_RowEvArgName="GetTaskListRowChangeEvent" msprop:Generator_RowClassName="GetTaskListRow">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="ID_Task" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnID_Task" msprop:Generator_ColumnPropNameInRow="ID_Task" msprop:Generator_ColumnPropNameInTable="ID_TaskColumn" msprop:Generator_UserColumnName="ID_Task" type="xs:int" />
|
||||
|
|
@ -200,7 +218,7 @@
|
|||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="CommentOnEvent" msprop:Generator_TableClassName="CommentOnEventDataTable" msprop:Generator_TableVarName="tableCommentOnEvent" msprop:Generator_RowChangedName="CommentOnEventRowChanged" msprop:Generator_TablePropName="CommentOnEvent" msprop:Generator_RowDeletingName="CommentOnEventRowDeleting" msprop:Generator_RowChangingName="CommentOnEventRowChanging" msprop:Generator_RowEvHandlerName="CommentOnEventRowChangeEventHandler" msprop:Generator_RowDeletedName="CommentOnEventRowDeleted" msprop:Generator_RowClassName="CommentOnEventRow" msprop:Generator_UserTableName="CommentOnEvent" msprop:Generator_RowEvArgName="CommentOnEventRowChangeEvent">
|
||||
<xs:element name="CommentOnEvent" msprop:Generator_TableClassName="CommentOnEventDataTable" msprop:Generator_TableVarName="tableCommentOnEvent" msprop:Generator_TablePropName="CommentOnEvent" msprop:Generator_RowDeletingName="CommentOnEventRowDeleting" msprop:Generator_RowChangingName="CommentOnEventRowChanging" msprop:Generator_RowEvHandlerName="CommentOnEventRowChangeEventHandler" msprop:Generator_RowDeletedName="CommentOnEventRowDeleted" msprop:Generator_UserTableName="CommentOnEvent" msprop:Generator_RowChangedName="CommentOnEventRowChanged" msprop:Generator_RowEvArgName="CommentOnEventRowChangeEvent" msprop:Generator_RowClassName="CommentOnEventRow">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="ID_CommnentOnEvent" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnID_CommnentOnEvent" msprop:Generator_ColumnPropNameInRow="ID_CommnentOnEvent" msprop:Generator_ColumnPropNameInTable="ID_CommnentOnEventColumn" msprop:Generator_UserColumnName="ID_CommnentOnEvent" type="xs:int" />
|
||||
|
|
@ -243,6 +261,20 @@
|
|||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="Installation" msprop:Generator_TableClassName="InstallationDataTable" msprop:Generator_TableVarName="tableInstallation" msprop:Generator_TablePropName="Installation" msprop:Generator_RowDeletingName="InstallationRowDeleting" msprop:Generator_RowChangingName="InstallationRowChanging" msprop:Generator_RowEvHandlerName="InstallationRowChangeEventHandler" msprop:Generator_RowDeletedName="InstallationRowDeleted" msprop:Generator_UserTableName="Installation" msprop:Generator_RowChangedName="InstallationRowChanged" msprop:Generator_RowEvArgName="InstallationRowChangeEvent" msprop:Generator_RowClassName="InstallationRow">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="Inst_CODE" msprop:Generator_ColumnVarNameInTable="columnInst_CODE" msprop:Generator_ColumnPropNameInRow="Inst_CODE" msprop:Generator_ColumnPropNameInTable="Inst_CODEColumn" msprop:Generator_UserColumnName="Inst_CODE" type="xs:int" />
|
||||
<xs:element name="InstallationName" msprop:Generator_ColumnVarNameInTable="columnInstallationName" msprop:Generator_ColumnPropNameInRow="InstallationName" msprop:Generator_ColumnPropNameInTable="InstallationNameColumn" msprop:Generator_UserColumnName="InstallationName" 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:choice>
|
||||
</xs:complexType>
|
||||
<xs:unique name="Constraint1" msdata:PrimaryKey="true">
|
||||
|
|
|
|||
|
|
@ -6,9 +6,10 @@
|
|||
</autogenerated>-->
|
||||
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="45" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
|
||||
<Shapes>
|
||||
<Shape ID="DesignTable:GetTaskInfo" ZOrder="3" X="285" Y="59" Height="305" Width="269" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
|
||||
<Shape ID="DesignTable:GetTaskList" ZOrder="2" X="58" Y="55" Height="191" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
|
||||
<Shape ID="DesignTable:CommentOnEvent" ZOrder="1" X="592" Y="61" Height="210" Width="285" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
|
||||
<Shape ID="DesignTable:GetTaskInfo" ZOrder="4" X="285" Y="59" Height="305" Width="269" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
|
||||
<Shape ID="DesignTable:GetTaskList" ZOrder="3" X="58" Y="55" Height="191" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
|
||||
<Shape ID="DesignTable:CommentOnEvent" ZOrder="2" X="592" Y="61" Height="210" Width="285" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
|
||||
<Shape ID="DesignTable:Installation" ZOrder="1" X="630" Y="342" Height="135" Width="247" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="76" />
|
||||
</Shapes>
|
||||
<Connectors />
|
||||
</DiagramLayout>
|
||||
|
|
@ -51,5 +51,5 @@ using System.Windows;
|
|||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.3.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.3.0.0")]
|
||||
[assembly: AssemblyVersion("1.3.1.0")]
|
||||
[assembly: AssemblyFileVersion("1.3.1.0")]
|
||||
|
|
|
|||
|
|
@ -8,16 +8,15 @@
|
|||
Title="Settings" Height="450" Width="800" Loaded="Window_Loaded">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="50" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="20" />
|
||||
<RowDefinition Height="auto" />
|
||||
|
||||
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="150"/>
|
||||
|
|
@ -25,26 +24,34 @@
|
|||
<ColumnDefinition Width="150"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="Com port"></TextBlock>
|
||||
<TextBox Name="tComPort" Text="1" Grid.Column="1" />
|
||||
<ComboBox Name="cComPort" Grid.Column="1" />
|
||||
<!--<TextBox Name="tComPort" Text="1" Grid.Column="1" />-->
|
||||
|
||||
<TextBlock Grid.Row="1" Grid.Column="0" Text="Installatie 1"></TextBlock>
|
||||
<TextBox Grid.Row="1" Name="tInsCode1" Text="1" Grid.Column="1" />
|
||||
<TextBox Grid.Row="1" Name="tInsName1" Text="BR1" Grid.Column="2" />
|
||||
<ComboBox Name="CIns1" Grid.Row="1" Grid.Column="1" SelectedValuePath="Inst_CODE" DisplayMemberPath="InstallationName" />
|
||||
<!--<TextBox Grid.Row="1" Name="tInsCode1" Text="1" Grid.Column="1" />-->
|
||||
<!--<TextBox Grid.Row="1" Name="tInsName1" Text="BR1" Grid.Column="2" />-->
|
||||
|
||||
|
||||
<TextBlock Grid.Row="2" Grid.Column="0" Text="Installatie 2"></TextBlock>
|
||||
<TextBox Grid.Row="2" Name="tInsCode2" Text="11" Grid.Column="1" />
|
||||
<TextBox Grid.Row="2" Name="tInsName2" Text="Venus" Grid.Column="2" />
|
||||
<ComboBox Name="CIns2" Grid.Row="2" Grid.Column="1" SelectedValuePath="Inst_CODE" DisplayMemberPath="InstallationName" />
|
||||
<!--<TextBox Grid.Row="2" Name="tInsCode2" Text="11" Grid.Column="1" />-->
|
||||
<!--<TextBox Grid.Row="2" Name="tInsName2" Text="Venus" Grid.Column="2" />-->
|
||||
|
||||
<TextBlock Grid.Row="3" Grid.Column="0" Text="Test CSN"></TextBlock>
|
||||
<TextBox Grid.Row="3" Name="tTestCSN" Text="" Grid.Column="1" />
|
||||
|
||||
<TextBlock Grid.Row="4" Grid.Column="0" Text="Badgelezers"></TextBlock>
|
||||
<TextBlock Grid.Row="4" Grid.Column="0" Text="Badgelezers" Height="23" Margin="0,0,0.2,0" VerticalAlignment="Top"></TextBlock>
|
||||
<ComboBox Grid.Row="4" Grid.ColumnSpan="2" Name="cbReaders" Text="" Grid.Column="1" />
|
||||
|
||||
<TextBlock Grid.Row="5" Grid.Column="0" Text="ValidationButtons" Height="23" Margin="0,0,0.2,0" VerticalAlignment="Top"></TextBlock>
|
||||
<CheckBox Grid.Row="5" Grid.ColumnSpan="2" Name="cbValidation" Grid.Column="1" />
|
||||
|
||||
<Button Grid.Row="6" Grid.Column="0" Content="OK" Name="bOK" Click="BOK_Click" />
|
||||
<Button Grid.Row="6" Grid.Column="2" Content="Cancel" Name="bCancel" Click="BCancel_Click" />
|
||||
<TextBlock Grid.Row="6" Grid.Column="0" Text="Beep EPD" Height="23" Margin="0,0,0.2,0" VerticalAlignment="Top"></TextBlock>
|
||||
<TextBox Grid.Row="6" Grid.ColumnSpan="2" Name="tBeep" Text="" Grid.Column="1" />
|
||||
|
||||
<Button Grid.Row="8" Grid.Column="0" Content="OK" Name="bOK" Click="BOK_Click" />
|
||||
<Button Grid.Row="8" Grid.Column="2" Content="Cancel" Name="bCancel" Click="BCancel_Click" />
|
||||
|
||||
</Grid>
|
||||
</Window>
|
||||
|
|
|
|||
|
|
@ -28,12 +28,28 @@ namespace eDosStation
|
|||
|
||||
private void BOK_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
thisStation.ComPort = int.Parse(tComPort.Text);
|
||||
if (int.TryParse(tInsCode1.Text, out int ins1)) thisStation.Inst_CODE1 = ins1; else thisStation.Inst_CODE1 = 0;
|
||||
if (int.TryParse(tInsCode2.Text, out int ins2)) thisStation.Inst_CODE2 = ins2; else thisStation.Inst_CODE2 = 0;
|
||||
thisStation.Inst_Name1= tInsName1.Text;
|
||||
thisStation.Inst_Name2 = tInsName2.Text;
|
||||
thisStation.TestCSN = tTestCSN.Text;
|
||||
string thiscom = cComPort.SelectedItem.ToString().Replace("COM","");
|
||||
thisStation.ComPort = int.Parse(thiscom);
|
||||
|
||||
|
||||
DataSet1.InstallationRow ir = CIns1.SelectedItem as DataSet1.InstallationRow;
|
||||
thisStation.Inst_CODE1 = ir.Inst_CODE;
|
||||
thisStation.Inst_Name1 = ir.InstallationName;
|
||||
|
||||
ir = CIns2.SelectedItem as DataSet1.InstallationRow;
|
||||
thisStation.Inst_CODE2 = ir.Inst_CODE;
|
||||
thisStation.Inst_Name2 = ir.InstallationName;
|
||||
|
||||
if (byte.TryParse(tBeep.Text, out byte bbeep)) thisStation.useBeep = bbeep; else thisStation.useBeep = 22;
|
||||
|
||||
if (cbValidation.IsChecked == null) cbValidation.IsChecked = false;
|
||||
thisStation.useTestButtons = cbValidation.IsChecked.Value;
|
||||
|
||||
//if (int.TryParse(tInsCode1.Text, out int ins1)) thisStation.Inst_CODE1 = ins1; else thisStation.Inst_CODE1 = 0;
|
||||
//if (int.TryParse(tInsCode2.Text, out int ins2)) thisStation.Inst_CODE2 = ins2; else thisStation.Inst_CODE2 = 0;
|
||||
//thisStation.Inst_Name1= tInsName1.Text;
|
||||
//thisStation.Inst_Name2 = tInsName2.Text;
|
||||
//thisStation.TestCSN = tTestCSN.Text;
|
||||
thisStation.Reader = cbReaders.Text;
|
||||
thisStation.Update();
|
||||
this.Close();
|
||||
|
|
@ -50,13 +66,40 @@ namespace eDosStation
|
|||
|
||||
private void Window_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
tComPort.Text = thisStation.ComPort.ToString();
|
||||
tInsCode1.Text = thisStation.Inst_CODE1.ToString();
|
||||
tInsCode2.Text = thisStation.Inst_CODE2.ToString();
|
||||
tInsName1.Text = thisStation.Inst_Name1.ToString();
|
||||
tInsName2.Text = thisStation.Inst_Name2.ToString();
|
||||
|
||||
foreach (string cn in System.IO.Ports.SerialPort.GetPortNames())
|
||||
{
|
||||
cComPort.Items.Add(cn);
|
||||
}
|
||||
string thisComport = $"COM{thisStation.ComPort}";
|
||||
if (!cComPort.Items.Contains(thisComport)) cComPort.Items.Add(thisComport);
|
||||
cComPort.SelectedItem = thisComport;
|
||||
|
||||
DataSet1.InstallationDataTable tbInstallations;
|
||||
using (var ta = new DataSet1TableAdapters.InstallationTableAdapter())
|
||||
tbInstallations = ta.GetData();
|
||||
tbInstallations.AddInstallationRow(0, "-");
|
||||
|
||||
|
||||
foreach (DataSet1.InstallationRow r in tbInstallations.Rows)
|
||||
{
|
||||
CIns1.Items.Add(r);
|
||||
CIns2.Items.Add(r);
|
||||
}
|
||||
CIns1.SelectedValue = thisStation.Inst_CODE1;
|
||||
CIns2.SelectedValue = thisStation.Inst_CODE2;
|
||||
|
||||
//tInsCode1.Text = thisStation.Inst_CODE1.ToString();
|
||||
//tInsCode2.Text = thisStation.Inst_CODE2.ToString();
|
||||
//tInsName1.Text = thisStation.Inst_Name1.ToString();
|
||||
//tInsName2.Text = thisStation.Inst_Name2.ToString();
|
||||
tTestCSN.Text = thisStation.TestCSN;
|
||||
|
||||
|
||||
tBeep.Text = thisStation.useBeep.ToString();
|
||||
cbValidation.IsChecked = thisStation.useTestButtons;
|
||||
|
||||
|
||||
bool rv = thisStation.dataInterface.checkCon(false);
|
||||
var a = new LSWDesfirePublic.CCard();
|
||||
a.GetReaderList();
|
||||
|
|
|
|||
|
|
@ -76,7 +76,6 @@ namespace eDosStation
|
|||
c = rs.GetOrdinal("Reader");
|
||||
if (rs.IsDBNull(c)) Reader = string.Empty; else Reader = Values[c].ToString();
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
c = rs.GetOrdinal("useTestButtons");
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue