diff --git a/UID/DISPO.vbproj b/UID/DISPO.vbproj index a8f89ab..5b61201 100644 --- a/UID/DISPO.vbproj +++ b/UID/DISPO.vbproj @@ -11,7 +11,7 @@ DISPO 512 WindowsForms - v4.5 + v4.7 false @@ -75,10 +75,11 @@ true - 69A9004CB6AFCCF29E2AD78A5EEE189F4FD214CB + 443CA3745EE904EED98572A89099259301BA06D1 - DISPO_TemporaryKey.pfx + + true @@ -610,6 +611,7 @@ + DataSet1.xsd @@ -767,792 +769,792 @@ False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite False - Exclude - True + Exclude + True Satellite diff --git a/UID/DataSet1.Designer.vb b/UID/DataSet1.Designer.vb index a0adf08..84fd920 100644 --- a/UID/DataSet1.Designer.vb +++ b/UID/DataSet1.Designer.vb @@ -28,7 +28,7 @@ Partial Public Class DataSet1 Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.BeginInit @@ -40,7 +40,7 @@ Partial Public Class DataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context, false) If (Me.IsBinarySerialized(info, context) = true) Then @@ -72,7 +72,7 @@ Partial Public Class DataSet1 End Sub _ Public Overrides Property SchemaSerializationMode() As Global.System.Data.SchemaSerializationMode @@ -85,7 +85,7 @@ Partial Public Class DataSet1 End Property _ Public Shadows ReadOnly Property Tables() As Global.System.Data.DataTableCollection Get @@ -94,7 +94,7 @@ Partial Public Class DataSet1 End Property _ Public Shadows ReadOnly Property Relations() As Global.System.Data.DataRelationCollection Get @@ -103,7 +103,7 @@ Partial Public Class DataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub InitializeDerivedDataSet() Me.BeginInit Me.InitClass @@ -111,7 +111,7 @@ Partial Public Class DataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataSet Dim cln As DataSet1 = CType(MyBase.Clone,DataSet1) cln.InitVars @@ -120,19 +120,19 @@ Partial Public Class DataSet1 End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function ShouldSerializeTables() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function ShouldSerializeRelations() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub ReadXmlSerializable(ByVal reader As Global.System.Xml.XmlReader) If (Me.DetermineSchemaSerializationMode(reader) = Global.System.Data.SchemaSerializationMode.IncludeSchema) Then Me.Reset @@ -153,7 +153,7 @@ Partial Public Class DataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetSchemaSerializable() As Global.System.Xml.Schema.XmlSchema Dim stream As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() Me.WriteXmlSchema(New Global.System.Xml.XmlTextWriter(stream, Nothing)) @@ -162,18 +162,18 @@ Partial Public Class DataSet1 End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Overloads Sub InitVars() Me.InitVars(true) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Overloads Sub InitVars(ByVal initTable As Boolean) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.DataSetName = "DataSet1" Me.Prefix = "" @@ -183,7 +183,7 @@ Partial Public Class DataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs) If (e.Action = Global.System.ComponentModel.CollectionChangeAction.Remove) Then Me.InitVars @@ -191,7 +191,7 @@ Partial Public Class DataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedDataSetSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim ds As DataSet1 = New DataSet1() Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() diff --git a/UID/My Project/Application.Designer.vb b/UID/My Project/Application.Designer.vb index cf0a406..4ca5bc8 100644 --- a/UID/My Project/Application.Designer.vb +++ b/UID/My Project/Application.Designer.vb @@ -14,8 +14,8 @@ Option Explicit On Namespace My - 'HINWEIS: Diese Datei wird automatisch generiert. Ändern Sie sie nicht direkt. Zum Ändern - ' oder bei in dieser Datei auftretenden Buildfehlern wechseln Sie zum Projekt-Designer. + 'HINWEIS: Diese Datei wird automatisch generiert und darf nicht direkt bearbeitet werden. Wenn Sie Änderungen vornehmen möchten + ' oder in dieser Datei Buildfehler auftreten, wechseln Sie zum Projekt-Designer. ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Mein Projekt" im ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor. ' diff --git a/UID/My Project/Resources.Designer.vb b/UID/My Project/Resources.Designer.vb index e5f457a..3a02293 100644 --- a/UID/My Project/Resources.Designer.vb +++ b/UID/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ @@ -415,7 +415,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 1.0.9.1 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 1.0.9.3 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/UID/My Project/Resources.resx b/UID/My Project/Resources.resx index bfc8e0c..3a0570e 100644 --- a/UID/My Project/Resources.resx +++ b/UID/My Project/Resources.resx @@ -155,7 +155,7 @@ ..\Resources\uid.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 1.0.9.1 + 1.0.9.3 ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/UID/My Project/Settings.Designer.vb b/UID/My Project/Settings.Designer.vb index 739e114..55168e2 100644 --- a/UID/My Project/Settings.Designer.vb +++ b/UID/My Project/Settings.Designer.vb @@ -15,21 +15,21 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) -#Region "Funktion zum automatischen Speichern von My.Settings" +#Region "Automatische My.Settings-Speicherfunktion" #If _MyType = "WindowsForms" Then Private Shared addedHandler As Boolean Private Shared addedHandlerLockObject As New Object _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) If My.Application.SaveMySettingsOnExit Then My.Settings.Save() End If diff --git a/UID/Reports/Auswertung/subrptEinzelauswertung.vb b/UID/Reports/Auswertung/subrptEinzelauswertung.vb index 891ab32..36ea14e 100644 --- a/UID/Reports/Auswertung/subrptEinzelauswertung.vb +++ b/UID/Reports/Auswertung/subrptEinzelauswertung.vb @@ -22,8 +22,9 @@ Public Class subrptEinzelauswertung txtPosNr.Text = Fields.Item("atr_frachtpos").Value txtAuftraggeber.Text = Fields.Item("atr_auftr_firma").Value txtEinnahmen.Text = CDbl(Fields.Item("Rechnungen").Value).ToString("c2") - txtAusgaben.Text = CDbl(Fields.Item("Vorkosten_Vorzeichen").Value).ToString("c2") - txtGewinn.Text = (CDbl(Fields.Item("Rechnungen").Value) - CDbl(Fields.Item("Vorkosten_Vorzeichen").Value)).ToString("c2") 'CDbl(Fields.Item("Marge").Value).ToString("c2") + ' txtAusgaben.Text = CDbl((Fields.Item("Vorkosten_Vorzeichen").Value)).ToString("c2") + txtAusgaben.Text = CDbl(CleanValue(Fields, "Vorkosten", "Integer")).ToString("c2") + txtGewinn.Text = (CDbl(Fields.Item("Rechnungen").Value) - CDbl(CleanValue(Fields, "Vorkosten", "Integer"))).ToString("c2") 'CDbl(Fields.Item("Vorkosten_Vorzeichen").Value)).ToString("c2") 'CDbl(Fields.Item("Marge").Value).ToString("c2") Dim i As Double = CDbl((100 * txtGewinn.Text) / txtEinnahmen.Text).ToString("N2") txtMarge.Text = CDbl((100 * txtGewinn.Text) / txtEinnahmen.Text).ToString("N2") & "%" txtFraechter.Text = VERAG_PROG_ALLGEMEIN.SQL.checkNullStr(Fields.Item("Frächter").Value) @@ -68,15 +69,38 @@ Public Class subrptEinzelauswertung If Fields.Item("ShortAuftragsart").Value = "TRANSP." Then Transporte = Transporte + 1 TransporteEinnahmen = TransporteEinnahmen + CDbl(Fields.Item("Rechnungen").Value).ToString("c2") - TransporteAusgaben = TransporteAusgaben + CDbl(Fields.Item("Vorkosten_Vorzeichen").Value).ToString("c2") + TransporteAusgaben = TransporteAusgaben + CDbl(CleanValue(Fields, "Vorkosten", "Integer")).ToString("c2") 'CDbl(Fields.Item("Vorkosten_Vorzeichen").Value).ToString("c2") ElseIf Fields.Item("ShortAuftragsart").Value = "HANDLING" Then Handlings = Handlings + 1 HandlingsEinnahmen = HandlingsEinnahmen + CDbl(Fields.Item("Rechnungen").Value).ToString("c2") - HandlingsAusgaben = HandlingsAusgaben + CDbl(Fields.Item("Vorkosten_Vorzeichen").Value).ToString("c2") + HandlingsAusgaben = HandlingsAusgaben + CDbl(CleanValue(Fields, "Vorkosten", "Integer")).ToString("c2") 'CDbl(Fields.Item("Vorkosten_Vorzeichen").Value).ToString("c2") End If End Sub + Function CleanString(StringIn As String) + If StringIn.Length > 0 Then + Return StringIn + Else + Return 0 + End If + + End Function + + Function CleanValue(FC As GrapeCity.ActiveReports.Data.FieldCollection, FI As String, ReturnArt As String) + If FC.Item(FI) Is Nothing Then + Select Case ReturnArt + Case "Integer" + Return 0 + Case "String" + Return "" + End Select + Else + Return FC.Item(FI).Value + End If + + End Function + Private Sub subrptEinzelauswertung_ReportStart(sender As Object, e As EventArgs) Handles Me.ReportStart DataSource = frmAuswertung.dt End Sub diff --git a/UID/UIDDataSet.Designer.vb b/UID/UIDDataSet.Designer.vb index 46333a6..75e6823 100644 --- a/UID/UIDDataSet.Designer.vb +++ b/UID/UIDDataSet.Designer.vb @@ -30,7 +30,7 @@ Partial Public Class UIDDataSet Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.BeginInit @@ -42,7 +42,7 @@ Partial Public Class UIDDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context, false) If (Me.IsBinarySerialized(info, context) = true) Then @@ -77,7 +77,7 @@ Partial Public Class UIDDataSet End Sub _ Public ReadOnly Property tblData() As tblDataDataTable @@ -87,7 +87,7 @@ Partial Public Class UIDDataSet End Property _ Public Overrides Property SchemaSerializationMode() As Global.System.Data.SchemaSerializationMode @@ -100,7 +100,7 @@ Partial Public Class UIDDataSet End Property _ Public Shadows ReadOnly Property Tables() As Global.System.Data.DataTableCollection Get @@ -109,7 +109,7 @@ Partial Public Class UIDDataSet End Property _ Public Shadows ReadOnly Property Relations() As Global.System.Data.DataRelationCollection Get @@ -118,7 +118,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub InitializeDerivedDataSet() Me.BeginInit Me.InitClass @@ -126,7 +126,7 @@ Partial Public Class UIDDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataSet Dim cln As UIDDataSet = CType(MyBase.Clone,UIDDataSet) cln.InitVars @@ -135,19 +135,19 @@ Partial Public Class UIDDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function ShouldSerializeTables() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function ShouldSerializeRelations() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub ReadXmlSerializable(ByVal reader As Global.System.Xml.XmlReader) If (Me.DetermineSchemaSerializationMode(reader) = Global.System.Data.SchemaSerializationMode.IncludeSchema) Then Me.Reset @@ -171,7 +171,7 @@ Partial Public Class UIDDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetSchemaSerializable() As Global.System.Xml.Schema.XmlSchema Dim stream As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() Me.WriteXmlSchema(New Global.System.Xml.XmlTextWriter(stream, Nothing)) @@ -180,13 +180,13 @@ Partial Public Class UIDDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Overloads Sub InitVars() Me.InitVars(true) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Overloads Sub InitVars(ByVal initTable As Boolean) Me.tabletblData = CType(MyBase.Tables("tblData"),tblDataDataTable) If (initTable = true) Then @@ -197,7 +197,7 @@ Partial Public Class UIDDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.DataSetName = "UIDDataSet" Me.Prefix = "" @@ -209,13 +209,13 @@ Partial Public Class UIDDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function ShouldSerializetblData() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs) If (e.Action = Global.System.ComponentModel.CollectionChangeAction.Remove) Then Me.InitVars @@ -223,7 +223,7 @@ Partial Public Class UIDDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedDataSetSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim ds As UIDDataSet = New UIDDataSet() Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() @@ -272,7 +272,7 @@ Partial Public Class UIDDataSet Return type End Function - _ + _ Public Delegate Sub tblDataRowChangeEventHandler(ByVal sender As Object, ByVal e As tblDataRowChangeEvent) ''' @@ -306,7 +306,7 @@ Partial Public Class UIDDataSet Private columnletzter_benutzer As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "tblData" @@ -316,7 +316,7 @@ Partial Public Class UIDDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -334,14 +334,14 @@ Partial Public Class UIDDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property IdColumn() As Global.System.Data.DataColumn Get Return Me.columnId @@ -349,7 +349,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property deaktColumn() As Global.System.Data.DataColumn Get Return Me.columndeakt @@ -357,7 +357,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property kuerzelColumn() As Global.System.Data.DataColumn Get Return Me.columnkuerzel @@ -365,7 +365,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property firmaColumn() As Global.System.Data.DataColumn Get Return Me.columnfirma @@ -373,7 +373,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property uidColumn() As Global.System.Data.DataColumn Get Return Me.columnuid @@ -381,7 +381,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property eoriColumn() As Global.System.Data.DataColumn Get Return Me.columneori @@ -389,7 +389,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property infoColumn() As Global.System.Data.DataColumn Get Return Me.columninfo @@ -397,7 +397,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property de_vz_vmColumn() As Global.System.Data.DataColumn Get Return Me.columnde_vz_vm @@ -405,7 +405,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property de_fisk_vmColumn() As Global.System.Data.DataColumn Get Return Me.columnde_fisk_vm @@ -413,7 +413,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property at_vzfisk_vmColumn() As Global.System.Data.DataColumn Get Return Me.columnat_vzfisk_vm @@ -421,7 +421,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property letzter_benutzerColumn() As Global.System.Data.DataColumn Get Return Me.columnletzter_benutzer @@ -429,7 +429,7 @@ Partial Public Class UIDDataSet End Property _ Public ReadOnly Property Count() As Integer Get @@ -438,33 +438,33 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As tblDataRow Get Return CType(Me.Rows(index),tblDataRow) End Get End Property - _ + _ Public Event tblDataRowChanging As tblDataRowChangeEventHandler - _ + _ Public Event tblDataRowChanged As tblDataRowChangeEventHandler - _ + _ Public Event tblDataRowDeleting As tblDataRowChangeEventHandler - _ + _ Public Event tblDataRowDeleted As tblDataRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Sub AddtblDataRow(ByVal row As tblDataRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Function AddtblDataRow(ByVal deakt As Boolean, ByVal kuerzel As String, ByVal firma As String, ByVal uid As String, ByVal eori As String, ByVal info As String, ByVal de_vz_vm As String, ByVal de_fisk_vm As String, ByVal at_vzfisk_vm As String, ByVal letzter_benutzer As String) As tblDataRow Dim rowtblDataRow As tblDataRow = CType(Me.NewRow,tblDataRow) Dim columnValuesArray() As Object = New Object() {Nothing, deakt, kuerzel, firma, uid, eori, info, de_vz_vm, de_fisk_vm, at_vzfisk_vm, letzter_benutzer} @@ -474,13 +474,13 @@ Partial Public Class UIDDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function FindById(ByVal Id As Integer) As tblDataRow Return CType(Me.Rows.Find(New Object() {Id}),tblDataRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As tblDataDataTable = CType(MyBase.Clone,tblDataDataTable) cln.InitVars @@ -488,13 +488,13 @@ Partial Public Class UIDDataSet End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New tblDataDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnId = MyBase.Columns("Id") Me.columndeakt = MyBase.Columns("deakt") @@ -510,7 +510,7 @@ Partial Public Class UIDDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.columnId = New Global.System.Data.DataColumn("Id", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnId) @@ -554,25 +554,25 @@ Partial Public Class UIDDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function NewtblDataRow() As tblDataRow Return CType(Me.NewRow,tblDataRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New tblDataRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(tblDataRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.tblDataRowChangedEvent) Is Nothing) Then @@ -581,7 +581,7 @@ Partial Public Class UIDDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.tblDataRowChangingEvent) Is Nothing) Then @@ -590,7 +590,7 @@ Partial Public Class UIDDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.tblDataRowDeletedEvent) Is Nothing) Then @@ -599,7 +599,7 @@ Partial Public Class UIDDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.tblDataRowDeletingEvent) Is Nothing) Then @@ -608,13 +608,13 @@ Partial Public Class UIDDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub RemovetblDataRow(ByVal row As tblDataRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -689,14 +689,14 @@ Partial Public Class UIDDataSet Private tabletblData As tblDataDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tabletblData = CType(Me.Table,tblDataDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property Id() As Integer Get Return CType(Me(Me.tabletblData.IdColumn),Integer) @@ -707,7 +707,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property deakt() As Boolean Get Return CType(Me(Me.tabletblData.deaktColumn),Boolean) @@ -718,7 +718,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property kuerzel() As String Get Try @@ -733,7 +733,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property firma() As String Get Try @@ -748,7 +748,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property uid() As String Get Try @@ -763,7 +763,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property eori() As String Get Try @@ -778,7 +778,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property info() As String Get Try @@ -793,7 +793,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property de_vz_vm() As String Get Try @@ -808,7 +808,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property de_fisk_vm() As String Get Try @@ -823,7 +823,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property at_vzfisk_vm() As String Get Try @@ -838,7 +838,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property letzter_benutzer() As String Get Try @@ -853,109 +853,109 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IskuerzelNull() As Boolean Return Me.IsNull(Me.tabletblData.kuerzelColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetkuerzelNull() Me(Me.tabletblData.kuerzelColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsfirmaNull() As Boolean Return Me.IsNull(Me.tabletblData.firmaColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetfirmaNull() Me(Me.tabletblData.firmaColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsuidNull() As Boolean Return Me.IsNull(Me.tabletblData.uidColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetuidNull() Me(Me.tabletblData.uidColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IseoriNull() As Boolean Return Me.IsNull(Me.tabletblData.eoriColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SeteoriNull() Me(Me.tabletblData.eoriColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function IsinfoNull() As Boolean Return Me.IsNull(Me.tabletblData.infoColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub SetinfoNull() Me(Me.tabletblData.infoColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function Isde_vz_vmNull() As Boolean Return Me.IsNull(Me.tabletblData.de_vz_vmColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub Setde_vz_vmNull() Me(Me.tabletblData.de_vz_vmColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function Isde_fisk_vmNull() As Boolean Return Me.IsNull(Me.tabletblData.de_fisk_vmColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub Setde_fisk_vmNull() Me(Me.tabletblData.de_fisk_vmColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function Isat_vzfisk_vmNull() As Boolean Return Me.IsNull(Me.tabletblData.at_vzfisk_vmColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub Setat_vzfisk_vmNull() Me(Me.tabletblData.at_vzfisk_vmColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function Isletzter_benutzerNull() As Boolean Return Me.IsNull(Me.tabletblData.letzter_benutzerColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub Setletzter_benutzerNull() Me(Me.tabletblData.letzter_benutzerColumn) = Global.System.Convert.DBNull End Sub @@ -964,7 +964,7 @@ Partial Public Class UIDDataSet ''' '''Row event argument class ''' - _ + _ Public Class tblDataRowChangeEvent Inherits Global.System.EventArgs @@ -973,7 +973,7 @@ Partial Public Class UIDDataSet Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New(ByVal row As tblDataRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -981,7 +981,7 @@ Partial Public Class UIDDataSet End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Row() As tblDataRow Get Return Me.eventRow @@ -989,7 +989,7 @@ Partial Public Class UIDDataSet End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -1023,14 +1023,14 @@ Namespace UIDDataSetTableAdapters Private _clearBeforeFill As Boolean _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.ClearBeforeFill = true End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter Get If (Me._adapter Is Nothing) Then @@ -1041,7 +1041,7 @@ Namespace UIDDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection Get If (Me._connection Is Nothing) Then @@ -1071,7 +1071,7 @@ Namespace UIDDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction Get Return Me._transaction @@ -1099,7 +1099,7 @@ Namespace UIDDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() Get If (Me._commandCollection Is Nothing) Then @@ -1110,7 +1110,7 @@ Namespace UIDDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ClearBeforeFill() As Boolean Get Return Me._clearBeforeFill @@ -1121,7 +1121,7 @@ Namespace UIDDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitAdapter() Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() @@ -1243,16 +1243,16 @@ Namespace UIDDataSetTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_letzter_benutzer", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "letzter_benutzer", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Id", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "Id", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub - - _ + + Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = DISPO.My.MySettings.Default.connToUID + Me._connection.ConnectionString = My.Settings.connToUID 'Global.UID.My.MySettings.Default.connToUID End Sub - + _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitCommandCollection() Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() @@ -1263,7 +1263,7 @@ Namespace UIDDataSetTableAdapters End Sub _ Public Overloads Overridable Function Fill(ByVal dataTable As UIDDataSet.tblDataDataTable) As Integer @@ -1276,7 +1276,7 @@ Namespace UIDDataSetTableAdapters End Function _ Public Overloads Overridable Function GetData() As UIDDataSet.tblDataDataTable @@ -1287,35 +1287,35 @@ Namespace UIDDataSetTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal dataTable As UIDDataSet.tblDataDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function _ Public Overloads Overridable Function Update(ByVal dataSet As UIDDataSet) As Integer Return Me.Adapter.Update(dataSet, "tblData") End Function _ Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) End Function _ Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(dataRows) End Function _ Public Overloads Overridable Function Delete(ByVal Original_Id As Integer, ByVal Original_deakt As Boolean, ByVal Original_kuerzel As String, ByVal Original_firma As String, ByVal Original_uid As String, ByVal Original_eori As String, ByVal Original_info As String, ByVal Original_de_vz_vm As String, ByVal Original_de_fisk_vm As String, ByVal Original_at_vzfisk_vm As String, ByVal Original_letzter_benutzer As String) As Integer @@ -1400,7 +1400,7 @@ Namespace UIDDataSetTableAdapters End Function _ Public Overloads Overridable Function Insert(ByVal deakt As Boolean, ByVal kuerzel As String, ByVal firma As String, ByVal uid As String, ByVal eori As String, ByVal info As String, ByVal de_vz_vm As String, ByVal de_fisk_vm As String, ByVal at_vzfisk_vm As String, ByVal letzter_benutzer As String) As Integer @@ -1466,7 +1466,7 @@ Namespace UIDDataSetTableAdapters End Function _ Public Overloads Overridable Function Update( _ @@ -1620,7 +1620,7 @@ Namespace UIDDataSetTableAdapters End Function _ Public Overloads Overridable Function Update( _ @@ -1669,7 +1669,7 @@ Namespace UIDDataSetTableAdapters Private _connection As Global.System.Data.IDbConnection _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property UpdateOrder() As UpdateOrderOption Get Return Me._updateOrder @@ -1680,7 +1680,7 @@ Namespace UIDDataSetTableAdapters End Property _ @@ -1694,7 +1694,7 @@ Namespace UIDDataSetTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property BackupDataSetBeforeUpdate() As Boolean Get Return Me._backupDataSetBeforeUpdate @@ -1705,7 +1705,7 @@ Namespace UIDDataSetTableAdapters End Property _ Public Property Connection() As Global.System.Data.IDbConnection Get @@ -1724,7 +1724,7 @@ Namespace UIDDataSetTableAdapters End Property _ Public ReadOnly Property TableAdapterInstanceCount() As Integer Get @@ -1740,7 +1740,7 @@ Namespace UIDDataSetTableAdapters '''Update rows in top-down order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateUpdatedRows(ByVal dataSet As UIDDataSet, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow), ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tblDataTableAdapter) Is Nothing) Then @@ -1759,7 +1759,7 @@ Namespace UIDDataSetTableAdapters '''Insert rows in top-down order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateInsertedRows(ByVal dataSet As UIDDataSet, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tblDataTableAdapter) Is Nothing) Then @@ -1777,7 +1777,7 @@ Namespace UIDDataSetTableAdapters '''Delete rows in bottom-up order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As UIDDataSet, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tblDataTableAdapter) Is Nothing) Then @@ -1795,7 +1795,7 @@ Namespace UIDDataSetTableAdapters '''Remove inserted rows that become updated rows after calling TableAdapter.Update(inserted rows) first ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function GetRealUpdatedRows(ByVal updatedRows() As Global.System.Data.DataRow, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Global.System.Data.DataRow() If ((updatedRows Is Nothing) _ OrElse (updatedRows.Length < 1)) Then @@ -1821,7 +1821,7 @@ Namespace UIDDataSetTableAdapters '''Update all changes to the dataset. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overridable Function UpdateAll(ByVal dataSet As UIDDataSet) As Integer If (dataSet Is Nothing) Then Throw New Global.System.ArgumentNullException("dataSet") @@ -1956,13 +1956,13 @@ Namespace UIDDataSetTableAdapters End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overridable Sub SortSelfReferenceRows(ByVal rows() As Global.System.Data.DataRow, ByVal relation As Global.System.Data.DataRelation, ByVal childFirst As Boolean) Global.System.Array.Sort(Of Global.System.Data.DataRow)(rows, New SelfReferenceComparer(relation, childFirst)) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overridable Function MatchTableAdapterConnection(ByVal inputConnection As Global.System.Data.IDbConnection) As Boolean If (Not (Me._connection) Is Nothing) Then Return true @@ -1980,7 +1980,7 @@ Namespace UIDDataSetTableAdapters ''' '''Update Order Option ''' - _ + _ Public Enum UpdateOrderOption InsertUpdateDelete = 0 @@ -1991,7 +1991,7 @@ Namespace UIDDataSetTableAdapters ''' '''Used to sort self-referenced table's rows ''' - _ + _ Private Class SelfReferenceComparer Inherits Object Implements Global.System.Collections.Generic.IComparer(Of Global.System.Data.DataRow) @@ -2001,7 +2001,7 @@ Namespace UIDDataSetTableAdapters Private _childFirst As Integer _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal relation As Global.System.Data.DataRelation, ByVal childFirst As Boolean) MyBase.New Me._relation = relation @@ -2013,7 +2013,7 @@ Namespace UIDDataSetTableAdapters End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function GetRoot(ByVal row As Global.System.Data.DataRow, ByRef distance As Integer) As Global.System.Data.DataRow Global.System.Diagnostics.Debug.Assert((Not (row) Is Nothing)) Dim root As Global.System.Data.DataRow = row @@ -2052,7 +2052,7 @@ Namespace UIDDataSetTableAdapters End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function Compare(ByVal row1 As Global.System.Data.DataRow, ByVal row2 As Global.System.Data.DataRow) As Integer Implements Global.System.Collections.Generic.IComparer(Of Global.System.Data.DataRow).Compare If Object.ReferenceEquals(row1, row2) Then Return 0 diff --git a/UID/UIDDataSet1.Designer.vb b/UID/UIDDataSet1.Designer.vb index 8dd7f8c..0d9b0cf 100644 --- a/UID/UIDDataSet1.Designer.vb +++ b/UID/UIDDataSet1.Designer.vb @@ -30,7 +30,7 @@ Partial Public Class UIDDataSet1 Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.BeginInit @@ -42,7 +42,7 @@ Partial Public Class UIDDataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context, false) If (Me.IsBinarySerialized(info, context) = true) Then @@ -77,7 +77,7 @@ Partial Public Class UIDDataSet1 End Sub _ Public ReadOnly Property tblUser() As tblUserDataTable @@ -87,7 +87,7 @@ Partial Public Class UIDDataSet1 End Property _ Public Overrides Property SchemaSerializationMode() As Global.System.Data.SchemaSerializationMode @@ -100,7 +100,7 @@ Partial Public Class UIDDataSet1 End Property _ Public Shadows ReadOnly Property Tables() As Global.System.Data.DataTableCollection Get @@ -109,7 +109,7 @@ Partial Public Class UIDDataSet1 End Property _ Public Shadows ReadOnly Property Relations() As Global.System.Data.DataRelationCollection Get @@ -118,7 +118,7 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub InitializeDerivedDataSet() Me.BeginInit Me.InitClass @@ -126,7 +126,7 @@ Partial Public Class UIDDataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataSet Dim cln As UIDDataSet1 = CType(MyBase.Clone,UIDDataSet1) cln.InitVars @@ -135,19 +135,19 @@ Partial Public Class UIDDataSet1 End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function ShouldSerializeTables() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function ShouldSerializeRelations() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub ReadXmlSerializable(ByVal reader As Global.System.Xml.XmlReader) If (Me.DetermineSchemaSerializationMode(reader) = Global.System.Data.SchemaSerializationMode.IncludeSchema) Then Me.Reset @@ -171,7 +171,7 @@ Partial Public Class UIDDataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetSchemaSerializable() As Global.System.Xml.Schema.XmlSchema Dim stream As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() Me.WriteXmlSchema(New Global.System.Xml.XmlTextWriter(stream, Nothing)) @@ -180,13 +180,13 @@ Partial Public Class UIDDataSet1 End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Overloads Sub InitVars() Me.InitVars(true) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Overloads Sub InitVars(ByVal initTable As Boolean) Me.tabletblUser = CType(MyBase.Tables("tblUser"),tblUserDataTable) If (initTable = true) Then @@ -197,7 +197,7 @@ Partial Public Class UIDDataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.DataSetName = "UIDDataSet1" Me.Prefix = "" @@ -209,13 +209,13 @@ Partial Public Class UIDDataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function ShouldSerializetblUser() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs) If (e.Action = Global.System.ComponentModel.CollectionChangeAction.Remove) Then Me.InitVars @@ -223,7 +223,7 @@ Partial Public Class UIDDataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedDataSetSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim ds As UIDDataSet1 = New UIDDataSet1() Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() @@ -272,7 +272,7 @@ Partial Public Class UIDDataSet1 Return type End Function - _ + _ Public Delegate Sub tblUserRowChangeEventHandler(ByVal sender As Object, ByVal e As tblUserRowChangeEvent) ''' @@ -300,7 +300,7 @@ Partial Public Class UIDDataSet1 Private columnmit_niederlassung As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "tblUser" @@ -310,7 +310,7 @@ Partial Public Class UIDDataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -328,14 +328,14 @@ Partial Public Class UIDDataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) MyBase.New(info, context) Me.InitVars End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property mit_idColumn() As Global.System.Data.DataColumn Get Return Me.columnmit_id @@ -343,7 +343,7 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property mit_usernameColumn() As Global.System.Data.DataColumn Get Return Me.columnmit_username @@ -351,7 +351,7 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property mit_pwdColumn() As Global.System.Data.DataColumn Get Return Me.columnmit_pwd @@ -359,7 +359,7 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property mit_vnameColumn() As Global.System.Data.DataColumn Get Return Me.columnmit_vname @@ -367,7 +367,7 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property mit_nnameColumn() As Global.System.Data.DataColumn Get Return Me.columnmit_nname @@ -375,7 +375,7 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property mit_berechtigungColumn() As Global.System.Data.DataColumn Get Return Me.columnmit_berechtigung @@ -383,7 +383,7 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property mit_infoColumn() As Global.System.Data.DataColumn Get Return Me.columnmit_info @@ -391,7 +391,7 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property mit_niederlassungColumn() As Global.System.Data.DataColumn Get Return Me.columnmit_niederlassung @@ -399,7 +399,7 @@ Partial Public Class UIDDataSet1 End Property _ Public ReadOnly Property Count() As Integer Get @@ -408,33 +408,33 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As tblUserRow Get Return CType(Me.Rows(index),tblUserRow) End Get End Property - _ + _ Public Event tblUserRowChanging As tblUserRowChangeEventHandler - _ + _ Public Event tblUserRowChanged As tblUserRowChangeEventHandler - _ + _ Public Event tblUserRowDeleting As tblUserRowChangeEventHandler - _ + _ Public Event tblUserRowDeleted As tblUserRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Sub AddtblUserRow(ByVal row As tblUserRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overloads Function AddtblUserRow(ByVal mit_username As String, ByVal mit_pwd As String, ByVal mit_vname As String, ByVal mit_nname As String, ByVal mit_berechtigung As Integer, ByVal mit_info As String, ByVal mit_niederlassung As String) As tblUserRow Dim rowtblUserRow As tblUserRow = CType(Me.NewRow,tblUserRow) Dim columnValuesArray() As Object = New Object() {Nothing, mit_username, mit_pwd, mit_vname, mit_nname, mit_berechtigung, mit_info, mit_niederlassung} @@ -444,13 +444,13 @@ Partial Public Class UIDDataSet1 End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function FindBymit_id(ByVal mit_id As Integer) As tblUserRow Return CType(Me.Rows.Find(New Object() {mit_id}),tblUserRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As tblUserDataTable = CType(MyBase.Clone,tblUserDataTable) cln.InitVars @@ -458,13 +458,13 @@ Partial Public Class UIDDataSet1 End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New tblUserDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnmit_id = MyBase.Columns("mit_id") Me.columnmit_username = MyBase.Columns("mit_username") @@ -477,7 +477,7 @@ Partial Public Class UIDDataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitClass() Me.columnmit_id = New Global.System.Data.DataColumn("mit_id", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnmit_id) @@ -511,25 +511,25 @@ Partial Public Class UIDDataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function NewtblUserRow() As tblUserRow Return CType(Me.NewRow,tblUserRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New tblUserRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(tblUserRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.tblUserRowChangedEvent) Is Nothing) Then @@ -538,7 +538,7 @@ Partial Public Class UIDDataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.tblUserRowChangingEvent) Is Nothing) Then @@ -547,7 +547,7 @@ Partial Public Class UIDDataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.tblUserRowDeletedEvent) Is Nothing) Then @@ -556,7 +556,7 @@ Partial Public Class UIDDataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.tblUserRowDeletingEvent) Is Nothing) Then @@ -565,13 +565,13 @@ Partial Public Class UIDDataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub RemovetblUserRow(ByVal row As tblUserRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() @@ -646,14 +646,14 @@ Partial Public Class UIDDataSet1 Private tabletblUser As tblUserDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tabletblUser = CType(Me.Table,tblUserDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property mit_id() As Integer Get Return CType(Me(Me.tabletblUser.mit_idColumn),Integer) @@ -664,7 +664,7 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property mit_username() As String Get Try @@ -679,7 +679,7 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property mit_pwd() As String Get Try @@ -694,7 +694,7 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property mit_vname() As String Get Try @@ -709,7 +709,7 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property mit_nname() As String Get Try @@ -724,7 +724,7 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property mit_berechtigung() As Integer Get Try @@ -739,7 +739,7 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property mit_info() As String Get Try @@ -754,7 +754,7 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property mit_niederlassung() As String Get Try @@ -769,85 +769,85 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function Ismit_usernameNull() As Boolean Return Me.IsNull(Me.tabletblUser.mit_usernameColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub Setmit_usernameNull() Me(Me.tabletblUser.mit_usernameColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function Ismit_pwdNull() As Boolean Return Me.IsNull(Me.tabletblUser.mit_pwdColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub Setmit_pwdNull() Me(Me.tabletblUser.mit_pwdColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function Ismit_vnameNull() As Boolean Return Me.IsNull(Me.tabletblUser.mit_vnameColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub Setmit_vnameNull() Me(Me.tabletblUser.mit_vnameColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function Ismit_nnameNull() As Boolean Return Me.IsNull(Me.tabletblUser.mit_nnameColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub Setmit_nnameNull() Me(Me.tabletblUser.mit_nnameColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function Ismit_berechtigungNull() As Boolean Return Me.IsNull(Me.tabletblUser.mit_berechtigungColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub Setmit_berechtigungNull() Me(Me.tabletblUser.mit_berechtigungColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function Ismit_infoNull() As Boolean Return Me.IsNull(Me.tabletblUser.mit_infoColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub Setmit_infoNull() Me(Me.tabletblUser.mit_infoColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function Ismit_niederlassungNull() As Boolean Return Me.IsNull(Me.tabletblUser.mit_niederlassungColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub Setmit_niederlassungNull() Me(Me.tabletblUser.mit_niederlassungColumn) = Global.System.Convert.DBNull End Sub @@ -856,7 +856,7 @@ Partial Public Class UIDDataSet1 ''' '''Row event argument class ''' - _ + _ Public Class tblUserRowChangeEvent Inherits Global.System.EventArgs @@ -865,7 +865,7 @@ Partial Public Class UIDDataSet1 Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New(ByVal row As tblUserRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -873,7 +873,7 @@ Partial Public Class UIDDataSet1 End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Row() As tblUserRow Get Return Me.eventRow @@ -881,7 +881,7 @@ Partial Public Class UIDDataSet1 End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -915,14 +915,14 @@ Namespace UIDDataSet1TableAdapters Private _clearBeforeFill As Boolean _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Sub New() MyBase.New Me.ClearBeforeFill = true End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter Get If (Me._adapter Is Nothing) Then @@ -933,7 +933,7 @@ Namespace UIDDataSet1TableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection Get If (Me._connection Is Nothing) Then @@ -963,7 +963,7 @@ Namespace UIDDataSet1TableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction Get Return Me._transaction @@ -991,7 +991,7 @@ Namespace UIDDataSet1TableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() Get If (Me._commandCollection Is Nothing) Then @@ -1002,7 +1002,7 @@ Namespace UIDDataSet1TableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ClearBeforeFill() As Boolean Get Return Me._clearBeforeFill @@ -1013,7 +1013,7 @@ Namespace UIDDataSet1TableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitAdapter() Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() @@ -1115,14 +1115,14 @@ Namespace UIDDataSet1TableAdapters End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = DISPO.My.MySettings.Default.connToUID + Me._connection.ConnectionString = My.Settings.connToUID 'Global.UID.My.MySettings.Default.connToUID End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitCommandCollection() Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() @@ -1133,7 +1133,7 @@ Namespace UIDDataSet1TableAdapters End Sub _ Public Overloads Overridable Function Fill(ByVal dataTable As UIDDataSet1.tblUserDataTable) As Integer @@ -1146,7 +1146,7 @@ Namespace UIDDataSet1TableAdapters End Function _ Public Overloads Overridable Function GetData() As UIDDataSet1.tblUserDataTable @@ -1157,35 +1157,35 @@ Namespace UIDDataSet1TableAdapters End Function _ Public Overloads Overridable Function Update(ByVal dataTable As UIDDataSet1.tblUserDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function _ Public Overloads Overridable Function Update(ByVal dataSet As UIDDataSet1) As Integer Return Me.Adapter.Update(dataSet, "tblUser") End Function _ Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) End Function _ Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer Return Me.Adapter.Update(dataRows) End Function _ Public Overloads Overridable Function Delete(ByVal Original_mit_id As Integer, ByVal Original_mit_username As String, ByVal Original_mit_pwd As String, ByVal Original_mit_vname As String, ByVal Original_mit_nname As String, ByVal Original_mit_berechtigung As Global.System.Nullable(Of Integer), ByVal Original_mit_info As String, ByVal Original_mit_niederlassung As String) As Integer @@ -1255,7 +1255,7 @@ Namespace UIDDataSet1TableAdapters End Function _ Public Overloads Overridable Function Insert(ByVal mit_username As String, ByVal mit_pwd As String, ByVal mit_vname As String, ByVal mit_nname As String, ByVal mit_berechtigung As Global.System.Nullable(Of Integer), ByVal mit_info As String, ByVal mit_niederlassung As String) As Integer @@ -1310,7 +1310,7 @@ Namespace UIDDataSet1TableAdapters End Function _ Public Overloads Overridable Function Update( _ @@ -1432,7 +1432,7 @@ Namespace UIDDataSet1TableAdapters End Function _ Public Overloads Overridable Function Update(ByVal mit_username As String, ByVal mit_pwd As String, ByVal mit_vname As String, ByVal mit_nname As String, ByVal mit_berechtigung As Global.System.Nullable(Of Integer), ByVal mit_info As String, ByVal mit_niederlassung As String, ByVal Original_mit_id As Integer, ByVal Original_mit_username As String, ByVal Original_mit_pwd As String, ByVal Original_mit_vname As String, ByVal Original_mit_nname As String, ByVal Original_mit_berechtigung As Global.System.Nullable(Of Integer), ByVal Original_mit_info As String, ByVal Original_mit_niederlassung As String) As Integer @@ -1460,7 +1460,7 @@ Namespace UIDDataSet1TableAdapters Private _connection As Global.System.Data.IDbConnection _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property UpdateOrder() As UpdateOrderOption Get Return Me._updateOrder @@ -1471,7 +1471,7 @@ Namespace UIDDataSet1TableAdapters End Property _ @@ -1485,7 +1485,7 @@ Namespace UIDDataSet1TableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property BackupDataSetBeforeUpdate() As Boolean Get Return Me._backupDataSetBeforeUpdate @@ -1496,7 +1496,7 @@ Namespace UIDDataSet1TableAdapters End Property _ Public Property Connection() As Global.System.Data.IDbConnection Get @@ -1515,7 +1515,7 @@ Namespace UIDDataSet1TableAdapters End Property _ Public ReadOnly Property TableAdapterInstanceCount() As Integer Get @@ -1531,7 +1531,7 @@ Namespace UIDDataSet1TableAdapters '''Update rows in top-down order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateUpdatedRows(ByVal dataSet As UIDDataSet1, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow), ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tblUserTableAdapter) Is Nothing) Then @@ -1550,7 +1550,7 @@ Namespace UIDDataSet1TableAdapters '''Insert rows in top-down order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateInsertedRows(ByVal dataSet As UIDDataSet1, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tblUserTableAdapter) Is Nothing) Then @@ -1568,7 +1568,7 @@ Namespace UIDDataSet1TableAdapters '''Delete rows in bottom-up order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As UIDDataSet1, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tblUserTableAdapter) Is Nothing) Then @@ -1586,7 +1586,7 @@ Namespace UIDDataSet1TableAdapters '''Remove inserted rows that become updated rows after calling TableAdapter.Update(inserted rows) first ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function GetRealUpdatedRows(ByVal updatedRows() As Global.System.Data.DataRow, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Global.System.Data.DataRow() If ((updatedRows Is Nothing) _ OrElse (updatedRows.Length < 1)) Then @@ -1612,7 +1612,7 @@ Namespace UIDDataSet1TableAdapters '''Update all changes to the dataset. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Overridable Function UpdateAll(ByVal dataSet As UIDDataSet1) As Integer If (dataSet Is Nothing) Then Throw New Global.System.ArgumentNullException("dataSet") @@ -1747,13 +1747,13 @@ Namespace UIDDataSet1TableAdapters End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overridable Sub SortSelfReferenceRows(ByVal rows() As Global.System.Data.DataRow, ByVal relation As Global.System.Data.DataRelation, ByVal childFirst As Boolean) Global.System.Array.Sort(Of Global.System.Data.DataRow)(rows, New SelfReferenceComparer(relation, childFirst)) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Protected Overridable Function MatchTableAdapterConnection(ByVal inputConnection As Global.System.Data.IDbConnection) As Boolean If (Not (Me._connection) Is Nothing) Then Return true @@ -1771,7 +1771,7 @@ Namespace UIDDataSet1TableAdapters ''' '''Update Order Option ''' - _ + _ Public Enum UpdateOrderOption InsertUpdateDelete = 0 @@ -1782,7 +1782,7 @@ Namespace UIDDataSet1TableAdapters ''' '''Used to sort self-referenced table's rows ''' - _ + _ Private Class SelfReferenceComparer Inherits Object Implements Global.System.Collections.Generic.IComparer(Of Global.System.Data.DataRow) @@ -1792,7 +1792,7 @@ Namespace UIDDataSet1TableAdapters Private _childFirst As Integer _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub New(ByVal relation As Global.System.Data.DataRelation, ByVal childFirst As Boolean) MyBase.New Me._relation = relation @@ -1804,7 +1804,7 @@ Namespace UIDDataSet1TableAdapters End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Function GetRoot(ByVal row As Global.System.Data.DataRow, ByRef distance As Integer) As Global.System.Data.DataRow Global.System.Diagnostics.Debug.Assert((Not (row) Is Nothing)) Dim root As Global.System.Data.DataRow = row @@ -1843,7 +1843,7 @@ Namespace UIDDataSet1TableAdapters End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Function Compare(ByVal row1 As Global.System.Data.DataRow, ByVal row2 As Global.System.Data.DataRow) As Integer Implements Global.System.Collections.Generic.IComparer(Of Global.System.Data.DataRow).Compare If Object.ReferenceEquals(row1, row2) Then Return 0 diff --git a/UID/app.config b/UID/app.config new file mode 100644 index 0000000..e437803 --- /dev/null +++ b/UID/app.config @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/UID/cDispoAuftraege.vb b/UID/cDispoAuftraege.vb index 0be1f73..70fa0fb 100644 --- a/UID/cDispoAuftraege.vb +++ b/UID/cDispoAuftraege.vb @@ -163,6 +163,8 @@ Public Class cDispoAuftraege Property atr_tripNr As String = "" Property atr_tripStopNr As Integer = -1 + Property atr_copyfrom As Integer = -1 + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL diff --git a/UID/cSqlDb.vb b/UID/cSqlDb.vb index 2c21a2e..1a2571d 100644 --- a/UID/cSqlDb.vb +++ b/UID/cSqlDb.vb @@ -40,6 +40,7 @@ Public Class cEntry Property kd_fax As String = "" Property kd_email As String = "" Property kd_homepage As String = "" + Property kd_TIMOCOM As String = "" Property kd_oez_id As String = "" Property kd_neutralisierung As String = "1" Property kd_aviso As String = "2" @@ -89,6 +90,7 @@ Public Class cEntry Me.kd_fax = dr.Item("kd_fax") Me.kd_email = dr.Item("kd_email") Me.kd_homepage = dr.Item("kd_homepage") + Me.kd_TIMOCOM = cMeineFunktionen.VarToStr(dr.Item("kd_TIMOCOM")) Me.kd_oez_id = dr.Item("kd_oez_id") Me.kd_neutralisierung = dr.Item("kd_neutralisierung") Me.kd_aviso = dr.Item("kd_aviso") @@ -1050,6 +1052,7 @@ Public Class cOptionenDAL daten.kd_fax = dr.Item("kd_fax") daten.kd_email = dr.Item("kd_email") daten.kd_homepage = dr.Item("kd_homepage") + daten.kd_TIMOCOM = cMeineFunktionen.VarToStr(dr.Item("kd_TIMOCOM")) daten.kd_oez_id = dr.Item("kd_oez_id") daten.kd_neutralisierung = dr.Item("kd_neutralisierung") daten.kd_aviso = dr.Item("kd_aviso") @@ -1368,8 +1371,8 @@ Public Class cOptionenDAL Public Function insertKunden(ByVal d As cEntry) As Integer Dim oez_id As Integer = insertOeffnungszeiten(d.kdoez) Dim sql = "INSERT INTO tblKunden " & - "(kd_firma, kd_str, kd_strnr, kd_plz, kd_ort, kd_land,kd_anspr1_vn,kd_anspr1_nn,kd_anspr2_vn,kd_anspr2_nn,kd_tel,kd_fax,kd_email,kd_homepage,kd_oez_id,kd_neutralisierung,kd_aviso,kd_isRefNr,kd_refNr,kd_info,kd_tarifInfo,kd_rolle,kd_FMZOLL_KdNr) VALUES " & - "(@kd_firma,@kd_str,@kd_strnr,@kd_plz,@kd_ort,@kd_land,@kd_anspr1_vn,@kd_anspr1_nn,@kd_anspr2_vn,@kd_anspr2_nn,@kd_tel,@kd_fax,@kd_email,@kd_homepage,@kd_oez_id,@kd_neutralisierung,@kd_aviso,@kd_isRefNr,@kd_refNr,@kd_info,@kd_tarifInfo,@kd_rolle,@kd_FMZOLL_KdNr)" + "(kd_firma, kd_str, kd_strnr, kd_plz, kd_ort, kd_land,kd_anspr1_vn,kd_anspr1_nn,kd_anspr2_vn,kd_anspr2_nn,kd_tel,kd_fax,kd_email,kd_homepage,kd_TIMOCOM,kd_oez_id,kd_neutralisierung,kd_aviso,kd_isRefNr,kd_refNr,kd_info,kd_tarifInfo,kd_rolle,kd_FMZOLL_KdNr) VALUES " & + "(@kd_firma,@kd_str,@kd_strnr,@kd_plz,@kd_ort,@kd_land,@kd_anspr1_vn,@kd_anspr1_nn,@kd_anspr2_vn,@kd_anspr2_nn,@kd_tel,@kd_fax,@kd_email,@kd_homepage,@kd_TIMOCOM,@kd_oez_id,@kd_neutralisierung,@kd_aviso,@kd_isRefNr,@kd_refNr,@kd_info,@kd_tarifInfo,@kd_rolle,@kd_FMZOLL_KdNr)" Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() Using cmd As New SqlCommand(sql, conn) @@ -1388,6 +1391,7 @@ Public Class cOptionenDAL cmd.Parameters.AddWithValue("@kd_fax", d.kd_fax) cmd.Parameters.AddWithValue("@kd_email", d.kd_email) cmd.Parameters.AddWithValue("@kd_homepage", d.kd_homepage) + cmd.Parameters.AddWithValue("@kd_TIMOCOM", d.kd_TIMOCOM) cmd.Parameters.AddWithValue("@kd_oez_id", oez_id) cmd.Parameters.AddWithValue("@kd_neutralisierung", d.kd_neutralisierung) cmd.Parameters.AddWithValue("@kd_aviso", d.kd_aviso) @@ -1469,7 +1473,7 @@ Public Class cOptionenDAL Dim hAuswahl As String = "" 'Änderung Dim sql = "UPDATE tblKunden " & - "SET kd_firma=@kd_firma, kd_str=@kd_str, kd_strnr=@kd_strnr, kd_plz=@kd_plz, kd_ort=@kd_ort, kd_land=@kd_land, kd_anspr1_vn=@kd_anspr1_vn, kd_anspr1_nn=@kd_anspr1_nn, kd_anspr2_vn=@kd_anspr2_vn, kd_anspr2_nn=@kd_anspr2_nn, kd_tel=@kd_tel, kd_fax=@kd_fax, kd_email=@kd_email, kd_homepage=@kd_homepage, kd_neutralisierung=@kd_neutralisierung, kd_aviso=@kd_aviso, kd_isRefNr=@kd_isRefNr,kd_refNr=@kd_refNr,kd_info=@kd_info, kd_tarifInfo=@kd_tarifInfo ,kd_rolle=@kd_rolle, kd_FMZOLL_KdNr=@kd_FMZOLL_KdNr " & + "SET kd_firma=@kd_firma, kd_str=@kd_str, kd_strnr=@kd_strnr, kd_plz=@kd_plz, kd_ort=@kd_ort, kd_land=@kd_land, kd_anspr1_vn=@kd_anspr1_vn, kd_anspr1_nn=@kd_anspr1_nn, kd_anspr2_vn=@kd_anspr2_vn, kd_anspr2_nn=@kd_anspr2_nn, kd_tel=@kd_tel, kd_fax=@kd_fax, kd_email=@kd_email, kd_homepage=@kd_homepage, kd_TIMOCOM=@kd_TIMOCOM, kd_neutralisierung=@kd_neutralisierung, kd_aviso=@kd_aviso, kd_isRefNr=@kd_isRefNr,kd_refNr=@kd_refNr,kd_info=@kd_info, kd_tarifInfo=@kd_tarifInfo ,kd_rolle=@kd_rolle, kd_FMZOLL_KdNr=@kd_FMZOLL_KdNr " & " WHERE kd_id=@kd_id" Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() Using cmd As New SqlCommand(sql, conn) @@ -1487,6 +1491,7 @@ Public Class cOptionenDAL cmd.Parameters.AddWithValue("@kd_fax", d.kd_fax) cmd.Parameters.AddWithValue("@kd_email", d.kd_email) cmd.Parameters.AddWithValue("@kd_homepage", d.kd_homepage) + cmd.Parameters.AddWithValue("@kd_TIMOCOM", d.kd_TIMOCOM) cmd.Parameters.AddWithValue("@kd_neutralisierung", d.kd_neutralisierung) cmd.Parameters.AddWithValue("@kd_aviso", d.kd_aviso) diff --git a/UID/frmDetails.Designer.vb b/UID/frmDetails.Designer.vb index abab15b..8f49b1e 100644 --- a/UID/frmDetails.Designer.vb +++ b/UID/frmDetails.Designer.vb @@ -133,6 +133,8 @@ Partial Class frmDetails Me.Label14 = New System.Windows.Forms.Label() Me.btnSave = New System.Windows.Forms.Button() Me.cboRolle = New DISPO.MyComboBox(Me.components) + Me.Label16 = New System.Windows.Forms.Label() + Me.txtTIMOCOM = New System.Windows.Forms.TextBox() Me.tabKunde.SuspendLayout() Me.tab1Allg.SuspendLayout() Me.GroupBox1.SuspendLayout() @@ -179,6 +181,8 @@ Partial Class frmDetails ' 'tab1Allg ' + Me.tab1Allg.Controls.Add(Me.txtTIMOCOM) + Me.tab1Allg.Controls.Add(Me.Label16) Me.tab1Allg.Controls.Add(Me.btnVERAGKDLaden) Me.tab1Allg.Controls.Add(Me.Label15) Me.tab1Allg.Controls.Add(Me.kdFirma) @@ -271,7 +275,7 @@ Partial Class frmDetails 'btnVERAGKDLaden ' Me.btnVERAGKDLaden.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnVERAGKDLaden.Location = New System.Drawing.Point(285, 349) + Me.btnVERAGKDLaden.Location = New System.Drawing.Point(287, 342) Me.btnVERAGKDLaden.Name = "btnVERAGKDLaden" Me.btnVERAGKDLaden.Size = New System.Drawing.Size(125, 23) Me.btnVERAGKDLaden.TabIndex = 513 @@ -281,7 +285,7 @@ Partial Class frmDetails 'Label15 ' Me.Label15.AutoSize = True - Me.Label15.Location = New System.Drawing.Point(10, 376) + Me.Label15.Location = New System.Drawing.Point(12, 373) Me.Label15.Name = "Label15" Me.Label15.Size = New System.Drawing.Size(63, 13) Me.Label15.TabIndex = 512 @@ -303,7 +307,7 @@ Partial Class frmDetails Me.kdFirma.KdNr = "-1" Me.kdFirma.kdNrField = Nothing Me.kdFirma.KdNrNullInt = Nothing - Me.kdFirma.Location = New System.Drawing.Point(114, 374) + Me.kdFirma.Location = New System.Drawing.Point(116, 371) Me.kdFirma.Name = "kdFirma" Me.kdFirma.nurAktive = True Me.kdFirma.searchActive = True @@ -359,7 +363,7 @@ Partial Class frmDetails 'Label27 ' Me.Label27.AutoSize = True - Me.Label27.Location = New System.Drawing.Point(303, 131) + Me.Label27.Location = New System.Drawing.Point(303, 99) Me.Label27.Name = "Label27" Me.Label27.Size = New System.Drawing.Size(59, 13) Me.Label27.TabIndex = 124 @@ -368,7 +372,7 @@ Partial Class frmDetails 'Label26 ' Me.Label26.AutoSize = True - Me.Label26.Location = New System.Drawing.Point(154, 131) + Me.Label26.Location = New System.Drawing.Point(154, 99) Me.Label26.Name = "Label26" Me.Label26.Size = New System.Drawing.Size(49, 13) Me.Label26.TabIndex = 123 @@ -376,14 +380,14 @@ Partial Class frmDetails ' 'txtAnspr2_nn ' - Me.txtAnspr2_nn.Location = New System.Drawing.Point(261, 173) + Me.txtAnspr2_nn.Location = New System.Drawing.Point(261, 141) Me.txtAnspr2_nn.Name = "txtAnspr2_nn" Me.txtAnspr2_nn.Size = New System.Drawing.Size(145, 20) Me.txtAnspr2_nn.TabIndex = 9 ' 'txtAnspr2_vn ' - Me.txtAnspr2_vn.Location = New System.Drawing.Point(110, 173) + Me.txtAnspr2_vn.Location = New System.Drawing.Point(110, 141) Me.txtAnspr2_vn.Name = "txtAnspr2_vn" Me.txtAnspr2_vn.Size = New System.Drawing.Size(145, 20) Me.txtAnspr2_vn.TabIndex = 8 @@ -867,7 +871,7 @@ Partial Class frmDetails ' Me.Label12.AutoSize = True Me.Label12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label12.Location = New System.Drawing.Point(10, 220) + Me.Label12.Location = New System.Drawing.Point(10, 182) Me.Label12.Name = "Label12" Me.Label12.Size = New System.Drawing.Size(51, 13) Me.Label12.TabIndex = 69 @@ -876,7 +880,7 @@ Partial Class frmDetails 'Label8 ' Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(10, 322) + Me.Label8.Location = New System.Drawing.Point(10, 284) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(62, 13) Me.Label8.TabIndex = 68 @@ -884,7 +888,7 @@ Partial Class frmDetails ' 'txtHomepage ' - Me.txtHomepage.Location = New System.Drawing.Point(114, 319) + Me.txtHomepage.Location = New System.Drawing.Point(114, 281) Me.txtHomepage.Name = "txtHomepage" Me.txtHomepage.Size = New System.Drawing.Size(296, 20) Me.txtHomepage.TabIndex = 13 @@ -892,7 +896,7 @@ Partial Class frmDetails 'Label11 ' Me.Label11.AutoSize = True - Me.Label11.Location = New System.Drawing.Point(10, 296) + Me.Label11.Location = New System.Drawing.Point(10, 258) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(39, 13) Me.Label11.TabIndex = 66 @@ -900,7 +904,7 @@ Partial Class frmDetails ' 'txtEmail ' - Me.txtEmail.Location = New System.Drawing.Point(114, 293) + Me.txtEmail.Location = New System.Drawing.Point(114, 255) Me.txtEmail.Name = "txtEmail" Me.txtEmail.Size = New System.Drawing.Size(296, 20) Me.txtEmail.TabIndex = 12 @@ -908,7 +912,7 @@ Partial Class frmDetails 'Label7 ' Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(10, 270) + Me.Label7.Location = New System.Drawing.Point(10, 232) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(27, 13) Me.Label7.TabIndex = 64 @@ -916,7 +920,7 @@ Partial Class frmDetails ' 'txtFax ' - Me.txtFax.Location = New System.Drawing.Point(114, 267) + Me.txtFax.Location = New System.Drawing.Point(114, 229) Me.txtFax.Name = "txtFax" Me.txtFax.Size = New System.Drawing.Size(296, 20) Me.txtFax.TabIndex = 11 @@ -924,7 +928,7 @@ Partial Class frmDetails 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(10, 244) + Me.Label6.Location = New System.Drawing.Point(10, 206) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(46, 13) Me.Label6.TabIndex = 62 @@ -932,7 +936,7 @@ Partial Class frmDetails ' 'txtTel ' - Me.txtTel.Location = New System.Drawing.Point(114, 241) + Me.txtTel.Location = New System.Drawing.Point(114, 203) Me.txtTel.Name = "txtTel" Me.txtTel.Size = New System.Drawing.Size(296, 20) Me.txtTel.TabIndex = 10 @@ -947,7 +951,7 @@ Partial Class frmDetails 'Label10 ' Me.Label10.AutoSize = True - Me.Label10.Location = New System.Drawing.Point(6, 176) + Me.Label10.Location = New System.Drawing.Point(6, 144) Me.Label10.Name = "Label10" Me.Label10.Size = New System.Drawing.Size(103, 13) Me.Label10.TabIndex = 58 @@ -955,7 +959,7 @@ Partial Class frmDetails ' 'txtAnspr1_nn ' - Me.txtAnspr1_nn.Location = New System.Drawing.Point(261, 147) + Me.txtAnspr1_nn.Location = New System.Drawing.Point(261, 115) Me.txtAnspr1_nn.Name = "txtAnspr1_nn" Me.txtAnspr1_nn.Size = New System.Drawing.Size(145, 20) Me.txtAnspr1_nn.TabIndex = 7 @@ -963,7 +967,7 @@ Partial Class frmDetails 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(6, 150) + Me.Label5.Location = New System.Drawing.Point(6, 118) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(97, 13) Me.Label5.TabIndex = 55 @@ -971,7 +975,7 @@ Partial Class frmDetails ' 'txtAnspr1_vn ' - Me.txtAnspr1_vn.Location = New System.Drawing.Point(110, 147) + Me.txtAnspr1_vn.Location = New System.Drawing.Point(110, 115) Me.txtAnspr1_vn.Name = "txtAnspr1_vn" Me.txtAnspr1_vn.Size = New System.Drawing.Size(145, 20) Me.txtAnspr1_vn.TabIndex = 6 @@ -1198,6 +1202,22 @@ Partial Class frmDetails Me.cboRolle.Size = New System.Drawing.Size(295, 21) Me.cboRolle.TabIndex = 511 ' + 'Label16 + ' + Me.Label16.AutoSize = True + Me.Label16.Location = New System.Drawing.Point(10, 313) + Me.Label16.Name = "Label16" + Me.Label16.Size = New System.Drawing.Size(61, 13) + Me.Label16.TabIndex = 515 + Me.Label16.Text = "TIMOCOM:" + ' + 'txtTIMOCOM + ' + Me.txtTIMOCOM.Location = New System.Drawing.Point(114, 307) + Me.txtTIMOCOM.Name = "txtTIMOCOM" + Me.txtTIMOCOM.Size = New System.Drawing.Size(296, 20) + Me.txtTIMOCOM.TabIndex = 516 + ' 'frmDetails ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1346,4 +1366,6 @@ Partial Class frmDetails Friend WithEvents Label15 As System.Windows.Forms.Label Friend WithEvents kdFirma As VERAG_PROG_ALLGEMEIN.KdSearchBox Friend WithEvents btnVERAGKDLaden As System.Windows.Forms.Button + Friend WithEvents txtTIMOCOM As TextBox + Friend WithEvents Label16 As Label End Class diff --git a/UID/frmDetails.vb b/UID/frmDetails.vb index 4565b57..ac7cff5 100644 --- a/UID/frmDetails.vb +++ b/UID/frmDetails.vb @@ -140,6 +140,7 @@ Public Class frmDetails binddata(txtFax, "Text", bindingDATA.bindingSource, "kd_fax") binddata(txtEmail, "Text", bindingDATA.bindingSource, "kd_email") binddata(txtHomepage, "Text", bindingDATA.bindingSource, "kd_homepage") + binddata(txtTIMOCOM, "Text", bindingDATA.bindingSource, "kd_TIMOCOM") Dim kdnr = (bindingDATA.bindingdataTable.Rows(0).Item("kd_FMZOLL_KdNr")) kdFirma.KdNr = If(kdnr Is DBNull.Value, -1, kdnr) @@ -198,7 +199,7 @@ Public Class frmDetails bindingOeZ.initBinding("SELECT * FROM tblOeffnungszeiten WHERE oz_id = " & bindingDATA.bindingdataTable.Rows(0).Item("kd_oez_id").ToString, "tblOeffnungszeiten") - AddHandler bindingOeZ.bindingdataTable.ColumnChanged, _ + AddHandler bindingOeZ.bindingdataTable.ColumnChanged, Sub(send As Object, evnt As EventArgs) btnSave.Enabled = True End Sub @@ -438,6 +439,7 @@ Public Class frmDetails txtFax.Text = data.kd_fax txtEmail.Text = data.kd_email txtHomepage.Text = data.kd_homepage + txtTIMOCOM.Text = data.kd_TIMOCOM kdFirma.KdNr = data.kd_FMZOLL_KdNr @@ -545,6 +547,7 @@ Public Class frmDetails entry.kd_fax = txtFax.Text entry.kd_email = txtEmail.Text entry.kd_homepage = txtHomepage.Text + entry.kd_TIMOCOM = txtTIMOCOM.Text data.kd_FMZOLL_KdNr = kdFirma.KdNrNullInt 'entry.kd_oez_id = txt @@ -656,6 +659,7 @@ Public Class frmDetails k.kd_fax = txtFax.Text k.kd_email = txtEmail.Text k.kd_homepage = txtHomepage.Text + k.kd_TIMOCOM = txtTIMOCOM.Text k.kd_FMZOLL_KdNr = kdFirma.KdNrNullInt 'entry.kd_oez_id = txtkdFirma.KdNr @@ -1013,7 +1017,7 @@ Public Class frmDetails Me.Cursor = Cursors.WaitCursor Try bindingDATA.bindingdataTable.Rows(0).Item("kd_FMZOLL_KdNr") = If(kdFirma.KdNrNullInt, DBNull.Value) - MsgBox(kdFirma.KdNrNullInt) + 'MsgBox(kdFirma.KdNrNullInt) If bindingDATA.updateBinding() AndAlso bindingOeZ.updateBinding Then btnSave.Enabled = False End If diff --git a/UID/frmLogin.vb b/UID/frmLogin.vb index 279f5c5..b3d76a7 100644 --- a/UID/frmLogin.vb +++ b/UID/frmLogin.vb @@ -34,10 +34,10 @@ End Sub Private Sub frmLogin_Load(sender As Object, e As EventArgs) Handles Me.Load - 'If sAppPath Like "*\bin\Debug" Then - ' txtUser.Text = "sebastian" - ' txtPwd.Text = "verag#3" - 'End If + If sAppPath Like "*\bin\Debug" Then + txtUser.Text = "sebastian" + txtPwd.Text = "verag#3" + End If If TESTSYSTEM Then lblTestsystem.Visible = True VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = TESTSYSTEM 'Dim tmp As String diff --git a/UID/frmMain/usrcntlAuftraege.vb b/UID/frmMain/usrcntlAuftraege.vb index 2dc7838..110b9f4 100644 --- a/UID/frmMain/usrcntlAuftraege.vb +++ b/UID/frmMain/usrcntlAuftraege.vb @@ -524,7 +524,7 @@ WHERE " & where & "" AUFTRAG.atr_id = -1 AUFTRAG.atr_datum = Now AUFTRAG.atr_frachtpos = Nothing - AUFTRAG.LADUNGEN.Clear() + ' AUFTRAG.LADUNGEN.Clear() AUFTRAG.BH_rechnungen.Clear() AUFTRAG.SAVE() @@ -538,22 +538,24 @@ WHERE " & where & "" a.atr_frachtpos = DISPO.getFrachtpos a.atr_datum = Now a.atr_abliefernachweis = False - a.atr_ladungen = New List(Of cLadungen) + + 'a.atr_ladungen = New List(Of cLadungen) a.bh_rechnungen = New List(Of cBuchhaltungRechnung) - a.cmr_ausl_land = "" - a.cmr_ausl_ort = "" - a.cmr_beigefDok = "" - a.cmr_anwAbs = "" - a.cmr_rueckerst = "" - a.cmr_frZahlanwFrei = "" - a.cmr_frZahlanwUnfrei = "" - a.cmr_besVereinb = "" - a.cmr_ausgefIn = "" - a.cmr_uebergabe_land = "" - a.cmr_uebergabe_ort = "" - a.cmr_uebergabe_datum = "" - a.cmr_vorbehFrachtf = "" + 'lt. Mestan CMR übernehmen (20191204) + 'a.cmr_ausl_land = "" + 'a.cmr_ausl_ort = "" + 'a.cmr_beigefDok = "" + 'a.cmr_anwAbs = "" + 'a.cmr_rueckerst = "" + 'a.cmr_frZahlanwFrei = "" + 'a.cmr_frZahlanwUnfrei = "" + 'a.cmr_besVereinb = "" + 'a.cmr_ausgefIn = "" + 'a.cmr_uebergabe_land = "" + 'a.cmr_uebergabe_ort = "" + 'a.cmr_uebergabe_datum = "" + 'a.cmr_vorbehFrachtf = "" a.bh_mon = "" diff --git a/UID/frmMain/usrcntlFirmen.vb b/UID/frmMain/usrcntlFirmen.vb index 206c4ca..0d540d2 100644 --- a/UID/frmMain/usrcntlFirmen.vb +++ b/UID/frmMain/usrcntlFirmen.vb @@ -202,7 +202,7 @@ Public Class usrcntlFirmen search = "%" End If - where &= " WHERE (kd_firma LIKE '%" & search & "%' OR (kd_str + ' ' + kd_strnr) LIKE '%" & search & "%' OR (kd_plz + ' - ' + kd_ort) LIKE '%" & search & "%' OR kd_land LIKE '%" & search & "%')" + where &= " WHERE (kd_firma LIKE '%" & search & "%' OR (kd_str + ' ' + kd_strnr) LIKE '%" & search & "%' OR (kd_plz + ' - ' + kd_ort) LIKE '%" & search & "%' OR kd_land LIKE '%" & search & "%' OR kd_TIMOCOM LIKE '%" & search & "%')" If cboRolle._value IsNot "-1" And cboRolle._value IsNot "" Then where &= " AND kd_rolle = '" & cboRolle._value & "'" End If