From 779b96578cfed73a7da8fcf7c49902c69de6b80f Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Fri, 30 Aug 2024 22:41:11 +0200 Subject: [PATCH 1/2] .Net 4.8, Anpassung TOBB NCTS Manuelles Senden --- DAKOSY_Worker/DAKOSY_Worker_lib.vbproj | 3 +- .../My Project/Resources.Designer.vb | 2 +- DAKOSY_Worker/My Project/Settings.Designer.vb | 2 +- MDM_Worker/MDM_Worker_lib.vbproj | 3 +- MDM_Worker/My Project/Resources.Designer.vb | 2 +- MDM_Worker/My Project/Settings.Designer.vb | 2 +- MailSender/App.config | 20 +- MailSender/MailSender.vbproj | 3 +- MailSender/My Project/Settings.Designer.vb | 2 +- .../My Project/Resources.Designer.vb | 2 +- .../My Project/Settings.Designer.vb | 2 +- TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj | 3 +- UID/ADMIN.vbproj | 3 +- UID/App.config | 82 ++++---- UID/DataSet1.Designer.vb | 32 +-- UID/DataSetBerechtigungen.Designer.vb | 198 +++++++++--------- UID/My Project/Application.Designer.vb | 6 + UID/My Project/Settings.Designer.vb | 2 +- UID/packages.config | 2 +- .../My Project/Application.Designer.vb | 8 +- .../My Project/Resources.Designer.vb | 47 +++-- .../My Project/Settings.Designer.vb | 60 +++--- cNCTSPartnerWorker/NCTSPartnerWorker.vbproj | 4 +- initATLASAufschubkonten/App.config | 2 +- .../My Project/Application.Designer.vb | 9 +- .../My Project/Resources.Designer.vb | 2 +- .../My Project/Settings.Designer.vb | 2 +- initATLASAufschubkonten/RoutineManager.vbproj | 3 +- .../VERAG_Interface/cVERAG_out_ncts.vb | 6 +- 29 files changed, 267 insertions(+), 247 deletions(-) diff --git a/DAKOSY_Worker/DAKOSY_Worker_lib.vbproj b/DAKOSY_Worker/DAKOSY_Worker_lib.vbproj index 1c8a7fa..d2f2982 100644 --- a/DAKOSY_Worker/DAKOSY_Worker_lib.vbproj +++ b/DAKOSY_Worker/DAKOSY_Worker_lib.vbproj @@ -10,7 +10,7 @@ DAKOSY_Worker 512 Windows - v4.7 + v4.8 @@ -167,6 +167,7 @@ True Application.myapp + True True diff --git a/DAKOSY_Worker/My Project/Resources.Designer.vb b/DAKOSY_Worker/My Project/Resources.Designer.vb index 70a586f..a201e43 100644 --- a/DAKOSY_Worker/My Project/Resources.Designer.vb +++ b/DAKOSY_Worker/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ diff --git a/DAKOSY_Worker/My Project/Settings.Designer.vb b/DAKOSY_Worker/My Project/Settings.Designer.vb index ad4ccf8..24f45ed 100644 --- a/DAKOSY_Worker/My Project/Settings.Designer.vb +++ b/DAKOSY_Worker/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/MDM_Worker/MDM_Worker_lib.vbproj b/MDM_Worker/MDM_Worker_lib.vbproj index 6114c44..1e146bd 100644 --- a/MDM_Worker/MDM_Worker_lib.vbproj +++ b/MDM_Worker/MDM_Worker_lib.vbproj @@ -10,7 +10,7 @@ MDM_Worker 512 Windows - v4.7 + v4.8 true @@ -76,6 +76,7 @@ True Application.myapp + True True diff --git a/MDM_Worker/My Project/Resources.Designer.vb b/MDM_Worker/My Project/Resources.Designer.vb index a64133c..4a7f365 100644 --- a/MDM_Worker/My Project/Resources.Designer.vb +++ b/MDM_Worker/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ diff --git a/MDM_Worker/My Project/Settings.Designer.vb b/MDM_Worker/My Project/Settings.Designer.vb index 94af05c..7ed6adb 100644 --- a/MDM_Worker/My Project/Settings.Designer.vb +++ b/MDM_Worker/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/MailSender/App.config b/MailSender/App.config index d0a84d3..b857fff 100644 --- a/MailSender/App.config +++ b/MailSender/App.config @@ -1,25 +1,25 @@ - + - + - - + + - - + + - - + + - - + + diff --git a/MailSender/MailSender.vbproj b/MailSender/MailSender.vbproj index c471987..220e907 100644 --- a/MailSender/MailSender.vbproj +++ b/MailSender/MailSender.vbproj @@ -11,7 +11,7 @@ MailSender 512 Console - v4.7 + v4.8 @@ -85,6 +85,7 @@ True Application.myapp + True True diff --git a/MailSender/My Project/Settings.Designer.vb b/MailSender/My Project/Settings.Designer.vb index 141c83e..258e5f2 100644 --- a/MailSender/My Project/Settings.Designer.vb +++ b/MailSender/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/TELOTEK_Worker_lib/My Project/Resources.Designer.vb b/TELOTEK_Worker_lib/My Project/Resources.Designer.vb index 19eda60..8a22911 100644 --- a/TELOTEK_Worker_lib/My Project/Resources.Designer.vb +++ b/TELOTEK_Worker_lib/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ diff --git a/TELOTEK_Worker_lib/My Project/Settings.Designer.vb b/TELOTEK_Worker_lib/My Project/Settings.Designer.vb index 157af87..36fdd35 100644 --- a/TELOTEK_Worker_lib/My Project/Settings.Designer.vb +++ b/TELOTEK_Worker_lib/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj b/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj index a7b94ff..02e4fa3 100644 --- a/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj +++ b/TELOTEK_Worker_lib/TELOTEC_Worker_lib.vbproj @@ -10,7 +10,7 @@ TELOTEC_Worker 512 Windows - v4.7 + v4.8 true @@ -74,6 +74,7 @@ True Application.myapp + True True diff --git a/UID/ADMIN.vbproj b/UID/ADMIN.vbproj index 3d36ce2..5d46b23 100644 --- a/UID/ADMIN.vbproj +++ b/UID/ADMIN.vbproj @@ -11,7 +11,7 @@ ADMIN 512 WindowsForms - v4.7 + v4.8 false @@ -605,6 +605,7 @@ True Application.myapp + True True diff --git a/UID/App.config b/UID/App.config index 72cae6e..de0bde4 100644 --- a/UID/App.config +++ b/UID/App.config @@ -1,16 +1,16 @@ - + -
+
- - + + - + @@ -26,145 +26,145 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/UID/DataSet1.Designer.vb b/UID/DataSet1.Designer.vb index 8b84794..1532138 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", "17.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", "17.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", "17.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", "17.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", "17.0.0.0")> _ Protected Overrides Function ShouldSerializeTables() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Function ShouldSerializeRelations() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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", "17.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", "17.0.0.0")> _ Friend Overloads Sub InitVars() Me.InitVars(true) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Overloads Sub InitVars(ByVal initTable As Boolean) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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", "17.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", "17.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/DataSetBerechtigungen.Designer.vb b/UID/DataSetBerechtigungen.Designer.vb index 0d0de63..7826f38 100644 --- a/UID/DataSetBerechtigungen.Designer.vb +++ b/UID/DataSetBerechtigungen.Designer.vb @@ -30,7 +30,7 @@ Partial Public Class DataSetBerechtigungen Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub New() MyBase.New Me.BeginInit @@ -42,7 +42,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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 DataSetBerechtigungen End Sub _ Public ReadOnly Property tblBerechtigungen() As tblBerechtigungenDataTable @@ -87,7 +87,7 @@ Partial Public Class DataSetBerechtigungen End Property _ Public Overrides Property SchemaSerializationMode() As Global.System.Data.SchemaSerializationMode @@ -100,7 +100,7 @@ Partial Public Class DataSetBerechtigungen End Property _ Public Shadows ReadOnly Property Tables() As Global.System.Data.DataTableCollection Get @@ -109,7 +109,7 @@ Partial Public Class DataSetBerechtigungen End Property _ Public Shadows ReadOnly Property Relations() As Global.System.Data.DataRelationCollection Get @@ -118,7 +118,7 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Sub InitializeDerivedDataSet() Me.BeginInit Me.InitClass @@ -126,7 +126,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataSet Dim cln As DataSetBerechtigungen = CType(MyBase.Clone,DataSetBerechtigungen) cln.InitVars @@ -135,19 +135,19 @@ Partial Public Class DataSetBerechtigungen End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Function ShouldSerializeTables() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Function ShouldSerializeRelations() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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 DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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 DataSetBerechtigungen End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Overloads Sub InitVars() Me.InitVars(true) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Overloads Sub InitVars(ByVal initTable As Boolean) Me.tabletblBerechtigungen = CType(MyBase.Tables("tblBerechtigungen"),tblBerechtigungenDataTable) If (initTable = true) Then @@ -197,7 +197,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Sub InitClass() Me.DataSetName = "DataSetBerechtigungen" Me.Prefix = "" @@ -209,13 +209,13 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Function ShouldSerializetblBerechtigungen() As Boolean Return false End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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 DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Shared Function GetTypedDataSetSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim ds As DataSetBerechtigungen = New DataSetBerechtigungen() Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() @@ -272,7 +272,7 @@ Partial Public Class DataSetBerechtigungen Return type End Function - _ + _ Public Delegate Sub tblBerechtigungenRowChangeEventHandler(ByVal sender As Object, ByVal e As tblBerechtigungenRowChangeEvent) ''' @@ -292,7 +292,7 @@ Partial Public Class DataSetBerechtigungen Private columnber_progId As Global.System.Data.DataColumn _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub New() MyBase.New Me.TableName = "tblBerechtigungen" @@ -302,7 +302,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Sub New(ByVal table As Global.System.Data.DataTable) MyBase.New Me.TableName = table.TableName @@ -320,14 +320,14 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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", "17.0.0.0")> _ Public ReadOnly Property ber_idColumn() As Global.System.Data.DataColumn Get Return Me.columnber_id @@ -335,7 +335,7 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public ReadOnly Property ber_nameColumn() As Global.System.Data.DataColumn Get Return Me.columnber_name @@ -343,7 +343,7 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public ReadOnly Property ber_sicherheitsstufeColumn() As Global.System.Data.DataColumn Get Return Me.columnber_sicherheitsstufe @@ -351,7 +351,7 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public ReadOnly Property ber_progIdColumn() As Global.System.Data.DataColumn Get Return Me.columnber_progId @@ -359,7 +359,7 @@ Partial Public Class DataSetBerechtigungen End Property _ Public ReadOnly Property Count() As Integer Get @@ -368,33 +368,33 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Default ReadOnly Property Item(ByVal index As Integer) As tblBerechtigungenRow Get Return CType(Me.Rows(index),tblBerechtigungenRow) End Get End Property - _ + _ Public Event tblBerechtigungenRowChanging As tblBerechtigungenRowChangeEventHandler - _ + _ Public Event tblBerechtigungenRowChanged As tblBerechtigungenRowChangeEventHandler - _ + _ Public Event tblBerechtigungenRowDeleting As tblBerechtigungenRowChangeEventHandler - _ + _ Public Event tblBerechtigungenRowDeleted As tblBerechtigungenRowChangeEventHandler _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Overloads Sub AddtblBerechtigungenRow(ByVal row As tblBerechtigungenRow) Me.Rows.Add(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Overloads Function AddtblBerechtigungenRow(ByVal ber_name As String, ByVal ber_sicherheitsstufe As Integer, ByVal ber_progId As Integer) As tblBerechtigungenRow Dim rowtblBerechtigungenRow As tblBerechtigungenRow = CType(Me.NewRow,tblBerechtigungenRow) Dim columnValuesArray() As Object = New Object() {Nothing, ber_name, ber_sicherheitsstufe, ber_progId} @@ -404,13 +404,13 @@ Partial Public Class DataSetBerechtigungen End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Function FindByber_id(ByVal ber_id As Integer) As tblBerechtigungenRow Return CType(Me.Rows.Find(New Object() {ber_id}),tblBerechtigungenRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Overrides Function Clone() As Global.System.Data.DataTable Dim cln As tblBerechtigungenDataTable = CType(MyBase.Clone,tblBerechtigungenDataTable) cln.InitVars @@ -418,13 +418,13 @@ Partial Public Class DataSetBerechtigungen End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable Return New tblBerechtigungenDataTable() End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Sub InitVars() Me.columnber_id = MyBase.Columns("ber_id") Me.columnber_name = MyBase.Columns("ber_name") @@ -433,7 +433,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Sub InitClass() Me.columnber_id = New Global.System.Data.DataColumn("ber_id", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) MyBase.Columns.Add(Me.columnber_id) @@ -454,25 +454,25 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Function NewtblBerechtigungenRow() As tblBerechtigungenRow Return CType(Me.NewRow,tblBerechtigungenRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow Return New tblBerechtigungenRow(builder) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Function GetRowType() As Global.System.Type Return GetType(tblBerechtigungenRow) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) If (Not (Me.tblBerechtigungenRowChangedEvent) Is Nothing) Then @@ -481,7 +481,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) If (Not (Me.tblBerechtigungenRowChangingEvent) Is Nothing) Then @@ -490,7 +490,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) If (Not (Me.tblBerechtigungenRowDeletedEvent) Is Nothing) Then @@ -499,7 +499,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) If (Not (Me.tblBerechtigungenRowDeletingEvent) Is Nothing) Then @@ -508,13 +508,13 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub RemovetblBerechtigungenRow(ByVal row As tblBerechtigungenRow) Me.Rows.Remove(row) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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() @@ -589,14 +589,14 @@ Partial Public Class DataSetBerechtigungen Private tabletblBerechtigungen As tblBerechtigungenDataTable _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) Me.tabletblBerechtigungen = CType(Me.Table,tblBerechtigungenDataTable) End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Property ber_id() As Integer Get Return CType(Me(Me.tabletblBerechtigungen.ber_idColumn),Integer) @@ -607,7 +607,7 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Property ber_name() As String Get Try @@ -622,7 +622,7 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Property ber_sicherheitsstufe() As Integer Get Try @@ -638,7 +638,7 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Property ber_progId() As Integer Get Try @@ -653,37 +653,37 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Function Isber_nameNull() As Boolean Return Me.IsNull(Me.tabletblBerechtigungen.ber_nameColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub Setber_nameNull() Me(Me.tabletblBerechtigungen.ber_nameColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Function Isber_sicherheitsstufeNull() As Boolean Return Me.IsNull(Me.tabletblBerechtigungen.ber_sicherheitsstufeColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub Setber_sicherheitsstufeNull() Me(Me.tabletblBerechtigungen.ber_sicherheitsstufeColumn) = Global.System.Convert.DBNull End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Function Isber_progIdNull() As Boolean Return Me.IsNull(Me.tabletblBerechtigungen.ber_progIdColumn) End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub Setber_progIdNull() Me(Me.tabletblBerechtigungen.ber_progIdColumn) = Global.System.Convert.DBNull End Sub @@ -692,7 +692,7 @@ Partial Public Class DataSetBerechtigungen ''' '''Row event argument class ''' - _ + _ Public Class tblBerechtigungenRowChangeEvent Inherits Global.System.EventArgs @@ -701,7 +701,7 @@ Partial Public Class DataSetBerechtigungen Private eventAction As Global.System.Data.DataRowAction _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub New(ByVal row As tblBerechtigungenRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row @@ -709,7 +709,7 @@ Partial Public Class DataSetBerechtigungen End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public ReadOnly Property Row() As tblBerechtigungenRow Get Return Me.eventRow @@ -717,7 +717,7 @@ Partial Public Class DataSetBerechtigungen End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public ReadOnly Property Action() As Global.System.Data.DataRowAction Get Return Me.eventAction @@ -751,14 +751,14 @@ Namespace DataSetBerechtigungenTableAdapters Private _clearBeforeFill As Boolean _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Sub New() MyBase.New Me.ClearBeforeFill = true End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter Get If (Me._adapter Is Nothing) Then @@ -769,7 +769,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection Get If (Me._connection Is Nothing) Then @@ -799,7 +799,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction Get Return Me._transaction @@ -827,7 +827,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() Get If (Me._commandCollection Is Nothing) Then @@ -838,7 +838,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Property ClearBeforeFill() As Boolean Get Return Me._clearBeforeFill @@ -849,7 +849,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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() @@ -910,14 +910,14 @@ Namespace DataSetBerechtigungenTableAdapters End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() Me._connection.ConnectionString = Global.ADMIN.My.MySettings.Default.connToAdminDEV End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Sub InitCommandCollection() Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() @@ -928,7 +928,7 @@ Namespace DataSetBerechtigungenTableAdapters End Sub _ Public Overloads Overridable Function Fill(ByVal dataTable As DataSetBerechtigungen.tblBerechtigungenDataTable) As Integer @@ -941,7 +941,7 @@ Namespace DataSetBerechtigungenTableAdapters End Function _ Public Overloads Overridable Function GetData() As DataSetBerechtigungen.tblBerechtigungenDataTable @@ -952,35 +952,35 @@ Namespace DataSetBerechtigungenTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal dataTable As DataSetBerechtigungen.tblBerechtigungenDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function _ Public Overloads Overridable Function Update(ByVal dataSet As DataSetBerechtigungen) As Integer Return Me.Adapter.Update(dataSet, "tblBerechtigungen") 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_ber_id As Integer, ByVal Original_ber_name As String, ByVal Original_ber_sicherheitsstufe As Global.System.Nullable(Of Integer), ByVal Original_ber_progId As Global.System.Nullable(Of Integer)) As Integer @@ -1022,7 +1022,7 @@ Namespace DataSetBerechtigungenTableAdapters End Function _ Public Overloads Overridable Function Insert(ByVal ber_name As String, ByVal ber_sicherheitsstufe As Global.System.Nullable(Of Integer), ByVal ber_progId As Global.System.Nullable(Of Integer)) As Integer @@ -1057,7 +1057,7 @@ Namespace DataSetBerechtigungenTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal ber_name As String, ByVal ber_sicherheitsstufe As Global.System.Nullable(Of Integer), ByVal ber_progId As Global.System.Nullable(Of Integer), ByVal Original_ber_id As Integer, ByVal Original_ber_name As String, ByVal Original_ber_sicherheitsstufe As Global.System.Nullable(Of Integer), ByVal Original_ber_progId As Global.System.Nullable(Of Integer), ByVal ber_id As Integer) As Integer @@ -1115,7 +1115,7 @@ Namespace DataSetBerechtigungenTableAdapters End Function _ Public Overloads Overridable Function Update(ByVal ber_name As String, ByVal ber_sicherheitsstufe As Global.System.Nullable(Of Integer), ByVal ber_progId As Global.System.Nullable(Of Integer), ByVal Original_ber_id As Integer, ByVal Original_ber_name As String, ByVal Original_ber_sicherheitsstufe As Global.System.Nullable(Of Integer), ByVal Original_ber_progId As Global.System.Nullable(Of Integer)) As Integer @@ -1143,7 +1143,7 @@ Namespace DataSetBerechtigungenTableAdapters Private _connection As Global.System.Data.IDbConnection _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Property UpdateOrder() As UpdateOrderOption Get Return Me._updateOrder @@ -1154,7 +1154,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ @@ -1168,7 +1168,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Property BackupDataSetBeforeUpdate() As Boolean Get Return Me._backupDataSetBeforeUpdate @@ -1179,7 +1179,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ Public Property Connection() As Global.System.Data.IDbConnection Get @@ -1198,7 +1198,7 @@ Namespace DataSetBerechtigungenTableAdapters End Property _ Public ReadOnly Property TableAdapterInstanceCount() As Integer Get @@ -1214,7 +1214,7 @@ Namespace DataSetBerechtigungenTableAdapters '''Update rows in top-down order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Function UpdateUpdatedRows(ByVal dataSet As DataSetBerechtigungen, 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._tblBerechtigungenTableAdapter) Is Nothing) Then @@ -1233,7 +1233,7 @@ Namespace DataSetBerechtigungenTableAdapters '''Insert rows in top-down order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Function UpdateInsertedRows(ByVal dataSet As DataSetBerechtigungen, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tblBerechtigungenTableAdapter) Is Nothing) Then @@ -1251,7 +1251,7 @@ Namespace DataSetBerechtigungenTableAdapters '''Delete rows in bottom-up order. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As DataSetBerechtigungen, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tblBerechtigungenTableAdapter) Is Nothing) Then @@ -1269,7 +1269,7 @@ Namespace DataSetBerechtigungenTableAdapters '''Remove inserted rows that become updated rows after calling TableAdapter.Update(inserted rows) first ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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 @@ -1295,7 +1295,7 @@ Namespace DataSetBerechtigungenTableAdapters '''Update all changes to the dataset. ''' _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Public Overridable Function UpdateAll(ByVal dataSet As DataSetBerechtigungen) As Integer If (dataSet Is Nothing) Then Throw New Global.System.ArgumentNullException("dataSet") @@ -1430,13 +1430,13 @@ Namespace DataSetBerechtigungenTableAdapters End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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", "17.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 @@ -1454,7 +1454,7 @@ Namespace DataSetBerechtigungenTableAdapters ''' '''Update Order Option ''' - _ + _ Public Enum UpdateOrderOption InsertUpdateDelete = 0 @@ -1465,7 +1465,7 @@ Namespace DataSetBerechtigungenTableAdapters ''' '''Used to sort self-referenced table's rows ''' - _ + _ Private Class SelfReferenceComparer Inherits Object Implements Global.System.Collections.Generic.IComparer(Of Global.System.Data.DataRow) @@ -1475,7 +1475,7 @@ Namespace DataSetBerechtigungenTableAdapters Private _childFirst As Integer _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _ Friend Sub New(ByVal relation As Global.System.Data.DataRelation, ByVal childFirst As Boolean) MyBase.New Me._relation = relation @@ -1487,7 +1487,7 @@ Namespace DataSetBerechtigungenTableAdapters End Sub _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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 @@ -1526,7 +1526,7 @@ Namespace DataSetBerechtigungenTableAdapters End Function _ + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.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/My Project/Application.Designer.vb b/UID/My Project/Application.Designer.vb index 941d8d0..d4fa0c9 100644 --- a/UID/My Project/Application.Designer.vb +++ b/UID/My Project/Application.Designer.vb @@ -34,5 +34,11 @@ Namespace My Protected Overrides Sub OnCreateMainForm() Me.MainForm = Global.ADMIN.frmLogin End Sub + + _ + Protected Overrides Function OnInitialize(ByVal commandLineArgs As System.Collections.ObjectModel.ReadOnlyCollection(Of String)) As Boolean + Me.MinimumSplashScreenDisplayTime = 0 + Return MyBase.OnInitialize(commandLineArgs) + End Function End Class End Namespace diff --git a/UID/My Project/Settings.Designer.vb b/UID/My Project/Settings.Designer.vb index 5cd9710..61645e6 100644 --- a/UID/My Project/Settings.Designer.vb +++ b/UID/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/UID/packages.config b/UID/packages.config index a5d6485..8194a9e 100644 --- a/UID/packages.config +++ b/UID/packages.config @@ -1,7 +1,7 @@  - + diff --git a/cNCTSPartnerWorker/My Project/Application.Designer.vb b/cNCTSPartnerWorker/My Project/Application.Designer.vb index 88dd01c..8ab460b 100644 --- a/cNCTSPartnerWorker/My Project/Application.Designer.vb +++ b/cNCTSPartnerWorker/My Project/Application.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ diff --git a/cNCTSPartnerWorker/My Project/Resources.Designer.vb b/cNCTSPartnerWorker/My Project/Resources.Designer.vb index 1006731..035044d 100644 --- a/cNCTSPartnerWorker/My Project/Resources.Designer.vb +++ b/cNCTSPartnerWorker/My Project/Resources.Designer.vb @@ -1,40 +1,41 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ Option Strict On Option Explicit On +Imports System Namespace My.Resources - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ + _ Friend Module Resources - + Private resourceMan As Global.System.Resources.ResourceManager - + Private resourceCulture As Global.System.Globalization.CultureInfo - + ''' - ''' Returns the cached ResourceManager instance used by this class. + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. ''' - _ + _ Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then @@ -44,17 +45,17 @@ Namespace My.Resources Return resourceMan End Get End Property - + ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. ''' - _ + _ Friend Property Culture() As Global.System.Globalization.CultureInfo Get Return resourceCulture End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) + Set resourceCulture = value End Set End Property diff --git a/cNCTSPartnerWorker/My Project/Settings.Designer.vb b/cNCTSPartnerWorker/My Project/Settings.Designer.vb index e848905..ca206b3 100644 --- a/cNCTSPartnerWorker/My Project/Settings.Designer.vb +++ b/cNCTSPartnerWorker/My Project/Settings.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ @@ -13,42 +13,42 @@ 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 "My.Settings Auto-Save Functionality" + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + +#Region "Automatische My.Settings-Speicherfunktion" #If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean + Private Shared addedHandler As Boolean - Private Shared addedHandlerLockObject As New Object + Private Shared addedHandlerLockObject As New Object - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - + #If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If #End If Return defaultInstance End Get diff --git a/cNCTSPartnerWorker/NCTSPartnerWorker.vbproj b/cNCTSPartnerWorker/NCTSPartnerWorker.vbproj index ce804ee..163e31f 100644 --- a/cNCTSPartnerWorker/NCTSPartnerWorker.vbproj +++ b/cNCTSPartnerWorker/NCTSPartnerWorker.vbproj @@ -10,8 +10,9 @@ cNCTSPartnerWorker 512 Windows - v4.7 + v4.8 true + true @@ -74,6 +75,7 @@ True Application.myapp + True True diff --git a/initATLASAufschubkonten/App.config b/initATLASAufschubkonten/App.config index 5f70bbd..a86c646 100644 --- a/initATLASAufschubkonten/App.config +++ b/initATLASAufschubkonten/App.config @@ -1,6 +1,6 @@ - + diff --git a/initATLASAufschubkonten/My Project/Application.Designer.vb b/initATLASAufschubkonten/My Project/Application.Designer.vb index 782bb50..44a50fa 100644 --- a/initATLASAufschubkonten/My Project/Application.Designer.vb +++ b/initATLASAufschubkonten/My Project/Application.Designer.vb @@ -1,6 +1,5 @@ '------------------------------------------------------------------------------ -' +' ' Dieser Code wurde von einem Tool generiert. ' Laufzeitversion:4.0.30319.42000 ' @@ -35,5 +34,11 @@ Namespace My Protected Overrides Sub OnCreateMainForm() Me.MainForm = Global.RoutineManager.frmStartOptions End Sub + + _ + Protected Overrides Function OnInitialize(ByVal commandLineArgs As System.Collections.ObjectModel.ReadOnlyCollection(Of String)) As Boolean + Me.MinimumSplashScreenDisplayTime = 0 + Return MyBase.OnInitialize(commandLineArgs) + End Function End Class End Namespace diff --git a/initATLASAufschubkonten/My Project/Resources.Designer.vb b/initATLASAufschubkonten/My Project/Resources.Designer.vb index 18f953a..a1c2d79 100644 --- a/initATLASAufschubkonten/My Project/Resources.Designer.vb +++ b/initATLASAufschubkonten/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ diff --git a/initATLASAufschubkonten/My Project/Settings.Designer.vb b/initATLASAufschubkonten/My Project/Settings.Designer.vb index e234f82..c0f4e6d 100644 --- a/initATLASAufschubkonten/My Project/Settings.Designer.vb +++ b/initATLASAufschubkonten/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/initATLASAufschubkonten/RoutineManager.vbproj b/initATLASAufschubkonten/RoutineManager.vbproj index 6c80c60..db32ba3 100644 --- a/initATLASAufschubkonten/RoutineManager.vbproj +++ b/initATLASAufschubkonten/RoutineManager.vbproj @@ -11,7 +11,7 @@ RoutineManager 512 WindowsForms - v4.7 + v4.8 @@ -216,6 +216,7 @@ True Application.myapp + True True diff --git a/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb b/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb index e363fb6..d8609cb 100644 --- a/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb +++ b/initATLASAufschubkonten/VERAG_Interface/cVERAG_out_ncts.vb @@ -51,10 +51,10 @@ Shared Function copyFileFTP_VERAGncts_DY_ByBezugsNr(BezugsNr As String, ISett As cVERAG_Interface_Settings, Optional FilialenNrTmp As Object = Nothing, Optional AbfertigungsNrTmp As Object = Nothing) As Boolean cVERAG_Interface_Settings = ISett Dim DY_TMP = DAKOSY_Worker.cDakosy_Zollanmeldungen.LOADByBezugsNr(BezugsNr) - Dim NCTS_TMP = DAKOSY_Worker.cDakosyNCTSOut.LOADByBezugsNr(BezugsNr, True) + Dim NCTS_TMP = DAKOSY_Worker.cDakosyNCTSOut004.LOADByBezugsNr(BezugsNr, True) If DY_TMP Is Nothing Then Return False If NCTS_TMP Is Nothing Then Return False - Return copyFileFTP_VERAGncts_DY(NCTS_TMP, DY_TMP, False, FilialenNrTmp, AbfertigungsNrTmp) + Return copyFileFTP_VERAGncts004_DY(NCTS_TMP, DY_TMP, False, FilialenNrTmp, AbfertigungsNrTmp) End Function Shared Function getLRN_ByCRN(CRN As String) As String Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -63,7 +63,7 @@ Shared Function getBezugnNr_ByMRN(MRN As String) As String Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL - Return SQL.getValueTxtBySql(" SELECT TOP 1 ncts_ObjectName FROM tblDakosy_NCTSOut WHERE ncts_MRN = '" & MRN & "' ORDER BY ncts_Trans_DatumZeit DESC", "FMZOLL") + Return SQL.getValueTxtBySql(" SELECT TOP 1 ncts_ObjectName FROM tblDakosy_NCTSOut004 WHERE ncts_MRN = '" & MRN & "' ORDER BY ncts_Trans_DatumZeit DESC", "FMZOLL") End Function Shared Function copyFileFTP_VERAGncts_DY(NCTS_TMP As DAKOSY_Worker.cDakosyNCTSOut, DY_TMP As DAKOSY_Worker.cDakosy_Zollanmeldungen, Optional checkAlreadyProvided As Boolean = True, Optional FilialenNrTmp As Object = Nothing, Optional AbfertigungsNrTmp As Object = Nothing) As Boolean From 61052b43e95b72f3222fa19b5f4c248dbd634dcf Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Fri, 6 Sep 2024 14:55:43 +0200 Subject: [PATCH 2/2] AAS --- .../frmMDMNachrichtenVerarbeitung.vb | 3 +- .../frmStartOptions.Designer.vb | 70 +++-- initATLASAufschubkonten/frmStartOptions.resx | 249 +++++++++--------- initATLASAufschubkonten/frmStartOptions.vb | 84 ++++-- 4 files changed, 248 insertions(+), 158 deletions(-) diff --git a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb index db9428f..2e4b51c 100644 --- a/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb +++ b/initATLASAufschubkonten/frmMDMNachrichtenVerarbeitung.vb @@ -657,7 +657,7 @@ Public Class frmMDMNachrichtenVerarbeitung 'Label31.Visible = True readPLOSE_Detail = "Zeilen: " & cnt Else - MsgBox("FEHLER beim Löschen der vorhandenen OP-Liste.") + ' MsgBox("FEHLER beim Löschen der vorhandenen OP-Liste.") End If End Using @@ -678,7 +678,6 @@ Public Class frmMDMNachrichtenVerarbeitung Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & "Datei: " & Dateiname, System.Reflection.MethodInfo.GetCurrentMethod.Name) - MsgBox(ex.StackTrace & ex.Message) readPLOSE_Detail = "" End Try End Function diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index 6b7a6d7..1b66bd1 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -169,6 +169,7 @@ Partial Class frmStartOptions Me.LinkLabel30 = New System.Windows.Forms.LinkLabel() Me.Label11 = New System.Windows.Forms.Label() Me.TabPage4 = New System.Windows.Forms.TabPage() + Me.cbxOnlyBilledTransactions = New System.Windows.Forms.CheckBox() Me.LinkLabel62 = New System.Windows.Forms.LinkLabel() Me.LinkLabel60 = New System.Windows.Forms.LinkLabel() Me.LinkLabel61 = New System.Windows.Forms.LinkLabel() @@ -245,7 +246,8 @@ Partial Class frmStartOptions Me.lblRoutineManager = New System.Windows.Forms.Label() Me.txtGJ_UNISPED = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Button21 = New System.Windows.Forms.Button() - Me.cbxOnlyBilledTransactions = New System.Windows.Forms.CheckBox() + Me.MyTextBox4 = New VERAG_PROG_ALLGEMEIN.MyTextBox() + Me.Label41 = New System.Windows.Forms.Label() Me.pnl.SuspendLayout() CType(Me.PictureBox23, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox22, System.ComponentModel.ISupportInitialize).BeginInit() @@ -956,6 +958,8 @@ Partial Class frmStartOptions ' 'TabPage1 ' + Me.TabPage1.Controls.Add(Me.Label41) + Me.TabPage1.Controls.Add(Me.MyTextBox4) Me.TabPage1.Controls.Add(Me.LinkLabel99) Me.TabPage1.Controls.Add(Me.PictureBox99) Me.TabPage1.Controls.Add(Me.Button99) @@ -1042,7 +1046,7 @@ Partial Class frmStartOptions Me.Button99.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button99.Location = New System.Drawing.Point(581, 346) Me.Button99.Name = "Button99" - Me.Button99.Size = New System.Drawing.Size(211, 24) + Me.Button99.Size = New System.Drawing.Size(195, 24) Me.Button99.TabIndex = 81 Me.Button99.Text = "AAS Sendung 24h" Me.Button99.UseVisualStyleBackColor = True @@ -1055,7 +1059,7 @@ Partial Class frmStartOptions Me.Button20.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button20.Location = New System.Drawing.Point(581, 323) Me.Button20.Name = "Button20" - Me.Button20.Size = New System.Drawing.Size(211, 24) + Me.Button20.Size = New System.Drawing.Size(195, 24) Me.Button20.TabIndex = 80 Me.Button20.Text = "xxx AAS Ankunft 4h" Me.Button20.UseVisualStyleBackColor = True @@ -1067,7 +1071,7 @@ Partial Class frmStartOptions Me.Button19.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button19.Location = New System.Drawing.Point(581, 300) Me.Button19.Name = "Button19" - Me.Button19.Size = New System.Drawing.Size(211, 24) + Me.Button19.Size = New System.Drawing.Size(195, 24) Me.Button19.TabIndex = 79 Me.Button19.Text = "AAS Vermerke 24h" Me.Button19.UseVisualStyleBackColor = True @@ -1089,7 +1093,7 @@ Partial Class frmStartOptions Me.Button18.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Button18.Location = New System.Drawing.Point(581, 277) Me.Button18.Name = "Button18" - Me.Button18.Size = New System.Drawing.Size(211, 24) + Me.Button18.Size = New System.Drawing.Size(195, 24) Me.Button18.TabIndex = 77 Me.Button18.Text = "AAS Vermerke Überschreitung" Me.Button18.UseVisualStyleBackColor = True @@ -2207,6 +2211,19 @@ Partial Class frmStartOptions Me.TabPage4.Text = "VERAG 360" Me.TabPage4.UseVisualStyleBackColor = True ' + 'cbxOnlyBilledTransactions + ' + Me.cbxOnlyBilledTransactions.AutoSize = True + Me.cbxOnlyBilledTransactions.Checked = True + Me.cbxOnlyBilledTransactions.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxOnlyBilledTransactions.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cbxOnlyBilledTransactions.Location = New System.Drawing.Point(670, 84) + Me.cbxOnlyBilledTransactions.Name = "cbxOnlyBilledTransactions" + Me.cbxOnlyBilledTransactions.Size = New System.Drawing.Size(172, 17) + Me.cbxOnlyBilledTransactions.TabIndex = 121 + Me.cbxOnlyBilledTransactions.Text = "nur verrechnete Transaktionen" + Me.cbxOnlyBilledTransactions.UseVisualStyleBackColor = True + ' 'LinkLabel62 ' Me.LinkLabel62.AutoSize = True @@ -3114,18 +3131,37 @@ Partial Class frmStartOptions Me.Button21.Text = "AAS Sendung 24h" Me.Button21.UseVisualStyleBackColor = True ' - 'cbxOnlyBilledTransactions + 'MyTextBox4 ' - Me.cbxOnlyBilledTransactions.AutoSize = True - Me.cbxOnlyBilledTransactions.Checked = True - Me.cbxOnlyBilledTransactions.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxOnlyBilledTransactions.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cbxOnlyBilledTransactions.Location = New System.Drawing.Point(670, 84) - Me.cbxOnlyBilledTransactions.Name = "cbxOnlyBilledTransactions" - Me.cbxOnlyBilledTransactions.Size = New System.Drawing.Size(172, 17) - Me.cbxOnlyBilledTransactions.TabIndex = 121 - Me.cbxOnlyBilledTransactions.Text = "nur verrechnete Transaktionen" - Me.cbxOnlyBilledTransactions.UseVisualStyleBackColor = True + Me.MyTextBox4._DateTimeOnly = False + Me.MyTextBox4._numbersOnly = False + Me.MyTextBox4._numbersOnlyKommastellen = "" + Me.MyTextBox4._numbersOnlyTrennzeichen = False + Me.MyTextBox4._Prozent = False + Me.MyTextBox4._ShortDateNew = True + Me.MyTextBox4._ShortDateOnly = True + Me.MyTextBox4._TimeOnly = False + Me.MyTextBox4._TimeOnly_Seconds = False + Me.MyTextBox4._value = "" + Me.MyTextBox4._Waehrung = False + Me.MyTextBox4._WaehrungZeichen = False + Me.MyTextBox4.ForeColor = System.Drawing.Color.Red + Me.MyTextBox4.Location = New System.Drawing.Point(775, 277) + Me.MyTextBox4.MaxLineLength = -1 + Me.MyTextBox4.MaxLines_Warning = "" + Me.MyTextBox4.MaxLines_Warning_Label = Nothing + Me.MyTextBox4.Name = "MyTextBox4" + Me.MyTextBox4.Size = New System.Drawing.Size(53, 20) + Me.MyTextBox4.TabIndex = 87 + ' + 'Label41 + ' + Me.Label41.AutoSize = True + Me.Label41.Location = New System.Drawing.Point(772, 261) + Me.Label41.Name = "Label41" + Me.Label41.Size = New System.Drawing.Size(56, 13) + Me.Label41.TabIndex = 90 + Me.Label41.Text = "ab Datum:" ' 'frmStartOptions ' @@ -3403,4 +3439,6 @@ Partial Class frmStartOptions Friend WithEvents LinkLabel60 As LinkLabel Friend WithEvents LinkLabel62 As LinkLabel Friend WithEvents cbxOnlyBilledTransactions As CheckBox + Friend WithEvents Label41 As Label + Friend WithEvents MyTextBox4 As VERAG_PROG_ALLGEMEIN.MyTextBox End Class diff --git a/initATLASAufschubkonten/frmStartOptions.resx b/initATLASAufschubkonten/frmStartOptions.resx index 8d1e514..61eadd8 100644 --- a/initATLASAufschubkonten/frmStartOptions.resx +++ b/initATLASAufschubkonten/frmStartOptions.resx @@ -524,129 +524,6 @@ WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - True - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= @@ -743,6 +620,132 @@ WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + True + + + True + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index 628737d..b630611 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -14,6 +14,7 @@ Imports Renci.SshNet Imports VERAG_PROG_ALLGEMEIN + Public Class frmStartOptions Dim WithEvents timer As New Timer @@ -543,7 +544,7 @@ Public Class frmStartOptions VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False Dim f As New frmInfo(PARAM) f.Show() - doAASVermerke_Schwelle() + doAASVermerke_Schwelle(Nothing) closeMe() '------------------------------ @@ -3952,27 +3953,33 @@ Public Class frmStartOptions End Sub Private Sub Button18_Click(sender As Object, e As EventArgs) Handles Button18.Click - doAASVermerke_Schwelle() + Dim abDatum = Nothing + If MyTextBox4._value <> "" Then abDatum = CDate(MyTextBox4._value) + doAASVermerke_Schwelle(abDatum) End Sub - Function doAASVermerke_Schwelle() + Function doAASVermerke_Schwelle(Optional abDatum = Nothing) Try Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim dt = SQL.loadDgvBySql(" - SELECT TOP 1000 aviso.AvisoID,Vermerke.[Hinweis_Vermerk] - ,CASE WHEN Vermerke.SendungID is not null THEN(SELECT FilialenNr from tblSendungen WHERE tblSnd_SendungID=Vermerke.SendungID) ELSE NULL END FilialenNr + SELECT TOP 1000 aviso.AvisoID,Vermerke.[Hinweis_Vermerk],Vermerke.SendungID SendungsId + ,CASE WHEN Vermerke.SendungID is not null THEN(SELECT FilialenNr from tblSendungen WHERE tblSnd_SendungID=Vermerke.SendungID) ELSE NULL END FilialenNr,VermerkID FROM [Aviso] inner join Vermerke on [Aviso].AvisoID=Vermerke.AvisoID inner join VermerkeCodes on Vermerke.VermerkeCode=VermerkeCodes.VermerkCodeId WHERE [Aviso].Status NOT IN (1,2) AND AAS_Warnsystem=1 and AAS_Warnstufe=0 and DATEDIFF(HOUR,Vermerke.Datum,GETDATE())>AAS_SchwelleStunden and [VermerkIDAufgehoben] is null - and (Auftraggeber_KdNr IN (901043,100950,700945) or Frächter_KdNr IN (901043,100950,700945)) - AND Aviso.Datum > DATEADD( day,-1,GETDATE()) + /*and (Auftraggeber_KdNr IN (901043,100950,700945) or Frächter_KdNr IN (901043,100950,700945))*/ + AND Aviso.Datum > " & If(abDatum IsNot Nothing, "'" & CDate(abDatum).ToShortDateString & "'", " DATEADD( day,-1,GETDATE())") & " + AND Geloescht=0 ", "AVISO") If dt IsNot Nothing Then For Each r In dt.Rows - insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "REMINDER", "REMINDER: " & r("Hinweis_Vermerk"), 1) + MsgBox(r("AvisoId")) + insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "AAS: REMINDER", "REMINDER: " & r("Hinweis_Vermerk"), 1) + insertVermerk(r("AvisoId"), r("SendungsId"), 115, "(AAS) " & r("Hinweis_Vermerk")) + cVermerkeDAL.increaseWarnstufe(r("VermerkID")) Next End If Catch ex As Exception @@ -3995,7 +4002,9 @@ Public Class frmStartOptions If dt IsNot Nothing Then For Each r In dt.Rows - insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "REMINDER 24h", "REMINDER: " & r("Hinweis_Vermerk"), 0) + insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "AAS: REMINDER 24h", "REMINDER: " & r("Hinweis_Vermerk"), 0) + insertVermerk(r("AvisoId"), r("SendungsId"), 115, "(AAS) " & r("Hinweis_Vermerk")) + Next End If Catch ex As Exception @@ -4020,7 +4029,9 @@ Public Class frmStartOptions If dt IsNot Nothing Then For Each r In dt.Rows - insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "REMINDER", "REMINDER: " & r("Hinweis_Vermerk"), 0) + insertBenachrichtigung_AAS(r("AvisoId"), r("SendungsId"), VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(r("FilialenNr")), VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungenCodes.AAE_Benachrichtigung, "AAS: REMINDER", "REMINDER: " & r("Hinweis_Vermerk"), 0) + insertVermerk(r("AvisoId"), r("SendungsId"), 115, "(AAS) " & r("Hinweis_Vermerk")) + Next End If Catch ex As Exception @@ -4033,50 +4044,68 @@ Public Class frmStartOptions Function insertBenachrichtigung_AAS(AvisoId, SendungsId, firma, code, TXT_AAS_HEAD, TXT_AAS_BODY, prio) ' 'Benachrichtigung + If SendungsId Is DBNull.Value Then SendungsId = Nothing Try + 'Benutzer vorschreiben der Sendung... Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL Dim sendToID As String = SQL.DLookup("tblSnd_VG_MA", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1) Dim art = "B" + 'MsgBox("Benutzer vorschreiben" & sendToID) 'Wenn Benutzer vorschreiben nicht online, dann Benutzer der Sendung... If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then sendToID = SQL.DLookup("LetzterMitarbeiterId", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1) art = "B" End If + ' MsgBox("Benutzer der Sendung" & sendToID) 'Wenn Benutzer der Sendung nicht online, dann Benutzer des LKW .. If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then sendToID = SQL.DLookup("LetzterMitarbeiterId", "Aviso", "AvisoId='" & AvisoId & "'", "AVISO", -1) art = "B" End If + ' MsgBox("Benutzer der LKW" & sendToID) - 'Wenn Benutzer des LKWs nicht online, Team... + 'Wenn Benutzer des LKWs nicht online, Team der Sendung... If sendToID <= 0 OrElse (Not VERAG_PROG_ALLGEMEIN.cSession.IS_ONLINE(sendToID, True)) Then sendToID = SQL.DLookup("tblSnd_TeamId", "tblSendungen", "tblSnd_SendungID='" & SendungsId & "'", "AVISO", -1) art = "T" End If + ' MsgBox("Team der Sendung" & sendToID) - 'Wenn TEAM nicht gefunden, Firma... + 'Wenn Team der Sendung nicht gefunden, Team des LKW... + If sendToID <= 0 Then + sendToID = SQL.DLookup("TeamId", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO", -1) + art = "T" + End If + ' MsgBox("Team LKW " & sendToID) + + 'Wenn TEAM LKW nicht gefunden, Firma... If sendToID <= 0 Then If firma IsNot Nothing AndAlso firma <> "" Then sendToID = firma art = "F" End If End If + ' MsgBox("XXXX" & sendToID) + 'Wenn gefunden If (art = "F" AndAlso If(sendToID, "") <> "") OrElse sendToID >= 0 Then Dim statusAVISO = SQL.DLookup("Status", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO") Dim GrenzstelleAVISO = SQL.DLookup("Grenzstelle", "Aviso", "AvisoID='" & AvisoId & "'", "AVISO") - If GrenzstelleAVISO = "???" Then - Select Case statusAVISO + ' If GrenzstelleAVISO = "???" Then + Select Case statusAVISO Case VERAG_PROG_ALLGEMEIN.cGlobal.Status_NichtEingetroffen, VERAG_PROG_ALLGEMEIN.cGlobal.Status_Freigegeben 'Nicht Case Else + MsgBox("!!!!!" & sendToID) - VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(AvisoId, SendungsId, code, art, sendToID, TXT_AAS_HEAD, prio, , TXT_AAS_BODY.Trim,,, firma) - End Select - End If + VERAG_PROG_ALLGEMEIN.cAvisoBenachrichtigungen.INSERT_BENACHRICHTIGUNG(AvisoId, SendungsId, code, art, sendToID, TXT_AAS_HEAD, prio, , TXT_AAS_BODY.Trim,,, firma) + insertVermerk(AvisoId, SendungsId, 115, "(AAS) " & TXT_AAS_BODY) + + End Select + ' End If End If Catch ex As Exception @@ -4086,6 +4115,27 @@ Public Class frmStartOptions Return True End Function + + Sub insertVermerk(AvisoID, SendungID, VermerkCodeId, VermerkText) + If SendungID Is DBNull.Value Then SendungID = -1 + + Dim myVermerk As New cVermerk + myVermerk.VermerkID = 0 + myVermerk.AvisoID = AvisoID + myVermerk.Datum = Now + myVermerk.Mitarbeiter = "AAS (AUTO)" + myVermerk.MitarbeiterId = -1 + myVermerk.Hinweis_Vermerk = VermerkText + myVermerk.VermerkCodeId = VermerkCodeId + myVermerk.SendungID = SendungID + myVermerk.HintergrundVermerk = True + If SendungID > 0 Then myVermerk.VermerkArt = "S" Else myVermerk.VermerkArt = "A" + Dim VermerkeDAL As New cVermerkeDAL + + VermerkeDAL.SpeichernVermerk(myVermerk) + + End Sub + Private Sub Button19_Click(sender As Object, e As EventArgs) Handles Button19.Click doAASVermerke_24h() End Sub