diff --git a/Controls.RegexEditor/My Project/AssemblyInfo.vb b/Controls.RegexEditor/My Project/AssemblyInfo.vb index 0eda36fb..bc8b0f65 100644 --- a/Controls.RegexEditor/My Project/AssemblyInfo.vb +++ b/Controls.RegexEditor/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Controls.RegexEditor/RegexEditor.vbproj b/Controls.RegexEditor/RegexEditor.vbproj index 5da54aa2..fa2a26ed 100644 --- a/Controls.RegexEditor/RegexEditor.vbproj +++ b/Controls.RegexEditor/RegexEditor.vbproj @@ -48,6 +48,11 @@ On + + + + + @@ -73,13 +78,6 @@ - - Form - - - frmRegexEditor.vb - Form - True @@ -96,17 +94,23 @@ True + + frmRegexEditor.vb + + + Form + - - frmRegexEditor.vb - VbMyResourcesResXFileCodeGenerator Resources.Designer.vb My.Resources Designer + + frmRegexEditor.vb + diff --git a/Controls.RegexEditor/frmRegexEditor.Designer.vb b/Controls.RegexEditor/frmRegexEditor.Designer.vb index f44562a3..1e629ce4 100644 --- a/Controls.RegexEditor/frmRegexEditor.Designer.vb +++ b/Controls.RegexEditor/frmRegexEditor.Designer.vb @@ -1,106 +1,42 @@  _ Partial Class frmRegexEditor - Inherits System.Windows.Forms.Form + Inherits DevExpress.XtraEditors.XtraForm - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + 'Form overrides dispose to clean up the component list. _ Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + MyBase.Dispose(disposing) End Sub - 'Wird vom Windows Form-Designer benötigt. + 'Required by the Windows Form Designer Private components As System.ComponentModel.IContainer - 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. - 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. - 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.txtRegex = New System.Windows.Forms.TextBox() - Me.Label1 = New System.Windows.Forms.Label() - Me.Label4 = New System.Windows.Forms.Label() + Me.btnTest = New System.Windows.Forms.Button() + Me.btnSave = New System.Windows.Forms.Button() Me.labelResult = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() Me.txtTest = New System.Windows.Forms.TextBox() - Me.btnTest = New System.Windows.Forms.Button() - Me.btnSave = New System.Windows.Forms.Button() + Me.Label4 = New System.Windows.Forms.Label() + Me.Label1 = New System.Windows.Forms.Label() + Me.txtRegex = New System.Windows.Forms.TextBox() Me.SuspendLayout() ' - 'txtRegex - ' - Me.txtRegex.Location = New System.Drawing.Point(12, 25) - Me.txtRegex.Name = "txtRegex" - Me.txtRegex.Size = New System.Drawing.Size(419, 20) - Me.txtRegex.TabIndex = 0 - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(12, 9) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(101, 13) - Me.Label1.TabIndex = 2 - Me.Label1.Text = "Regular Expression:" - ' - 'Label4 - ' - Me.Label4.Location = New System.Drawing.Point(12, 48) - Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(419, 33) - Me.Label4.TabIndex = 8 - Me.Label4.Text = "Wenn die Eingabe insgesamt validiert werden soll, muss der Regex in ^ und $ einge" & - "schlossen sein" - ' - 'labelResult - ' - Me.labelResult.AutoSize = True - Me.labelResult.Location = New System.Drawing.Point(12, 163) - Me.labelResult.Name = "labelResult" - Me.labelResult.Size = New System.Drawing.Size(282, 13) - Me.labelResult.TabIndex = 12 - Me.labelResult.Text = "Klicken Sie auf Test, um die Regular Expression zu testen." - ' - 'Label3 - ' - Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(12, 150) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(51, 13) - Me.Label3.TabIndex = 11 - Me.Label3.Text = "Ergebnis:" - ' - 'Label2 - ' - Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(12, 100) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(61, 13) - Me.Label2.TabIndex = 10 - Me.Label2.Text = "Test String:" - ' - 'txtTest - ' - Me.txtTest.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.txtTest.Location = New System.Drawing.Point(12, 116) - Me.txtTest.Name = "txtTest" - Me.txtTest.Size = New System.Drawing.Size(419, 20) - Me.txtTest.TabIndex = 9 - ' 'btnTest ' Me.btnTest.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnTest.Location = New System.Drawing.Point(201, 193) + Me.btnTest.Location = New System.Drawing.Point(187, 192) Me.btnTest.Name = "btnTest" Me.btnTest.Size = New System.Drawing.Size(112, 31) - Me.btnTest.TabIndex = 14 + Me.btnTest.TabIndex = 23 Me.btnTest.Text = "Test" Me.btnTest.UseVisualStyleBackColor = True ' @@ -108,18 +44,83 @@ Partial Class frmRegexEditor ' Me.btnSave.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnSave.DialogResult = System.Windows.Forms.DialogResult.OK - Me.btnSave.Location = New System.Drawing.Point(319, 193) + Me.btnSave.Location = New System.Drawing.Point(305, 192) Me.btnSave.Name = "btnSave" Me.btnSave.Size = New System.Drawing.Size(112, 31) - Me.btnSave.TabIndex = 13 + Me.btnSave.TabIndex = 22 Me.btnSave.Text = "Speichern" Me.btnSave.UseVisualStyleBackColor = True ' + 'labelResult + ' + Me.labelResult.AutoSize = True + Me.labelResult.Location = New System.Drawing.Point(12, 163) + Me.labelResult.Name = "labelResult" + Me.labelResult.Size = New System.Drawing.Size(284, 13) + Me.labelResult.TabIndex = 21 + Me.labelResult.Text = "Klicken Sie auf Test, um die Regular Expression zu testen." + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(12, 150) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(52, 13) + Me.Label3.TabIndex = 20 + Me.Label3.Text = "Ergebnis:" + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(12, 100) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(63, 13) + Me.Label2.TabIndex = 19 + Me.Label2.Text = "Test String:" + ' + 'txtTest + ' + Me.txtTest.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtTest.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtTest.Location = New System.Drawing.Point(12, 116) + Me.txtTest.Name = "txtTest" + Me.txtTest.Size = New System.Drawing.Size(405, 20) + Me.txtTest.TabIndex = 18 + ' + 'Label4 + ' + Me.Label4.Location = New System.Drawing.Point(12, 48) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(419, 33) + Me.Label4.TabIndex = 17 + Me.Label4.Text = "Wenn die Eingabe insgesamt validiert werden soll, muss der Regex in ^ und $ einge" & + "schlossen sein" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(12, 9) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(103, 13) + Me.Label1.TabIndex = 16 + Me.Label1.Text = "Regular Expression:" + ' + 'txtRegex + ' + Me.txtRegex.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtRegex.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtRegex.Location = New System.Drawing.Point(12, 25) + Me.txtRegex.Name = "txtRegex" + Me.txtRegex.Size = New System.Drawing.Size(405, 20) + Me.txtRegex.TabIndex = 15 + ' 'frmRegexEditor ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(443, 236) + Me.ClientSize = New System.Drawing.Size(429, 235) Me.Controls.Add(Me.btnTest) Me.Controls.Add(Me.btnSave) Me.Controls.Add(Me.labelResult) @@ -129,21 +130,21 @@ Partial Class frmRegexEditor Me.Controls.Add(Me.Label4) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.txtRegex) + Me.IconOptions.ShowIcon = False Me.Name = "frmRegexEditor" - Me.ShowIcon = False Me.Text = "Regex Editor" Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents txtRegex As TextBox - Friend WithEvents Label1 As Label - Friend WithEvents Label4 As Label + Friend WithEvents btnTest As Button + Friend WithEvents btnSave As Button Friend WithEvents labelResult As Label Friend WithEvents Label3 As Label Friend WithEvents Label2 As Label Friend WithEvents txtTest As TextBox - Friend WithEvents btnTest As Button - Friend WithEvents btnSave As Button + Friend WithEvents Label4 As Label + Friend WithEvents Label1 As Label + Friend WithEvents txtRegex As TextBox End Class diff --git a/Controls.RegexEditor/frmRegexEditor.vb b/Controls.RegexEditor/frmRegexEditor.vb index dfc1b0e8..761ac9a9 100644 --- a/Controls.RegexEditor/frmRegexEditor.vb +++ b/Controls.RegexEditor/frmRegexEditor.vb @@ -32,4 +32,4 @@ Public Class frmRegexEditor Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click RegexString = txtRegex.Text End Sub -End Class +End Class \ No newline at end of file diff --git a/DDMonorepo.sln b/DDMonorepo.sln index ed758882..23aa92d6 100644 --- a/DDMonorepo.sln +++ b/DDMonorepo.sln @@ -58,8 +58,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "JobRunner", "Service.JobRun EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "LookupControlGui", "LookupControlGui\LookupControlGui.vbproj", "{B65E24B3-D334-455D-A0BF-B33B8358B013}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "MonoDiag", "LoggerDiag\MonoDiag.vbproj", "{3D437957-B90B-4D8F-9219-6D19B0C90994}" -EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Language", "Modules.Language\Language.vbproj", "{D3C8CFED-D6F6-43A8-9BDF-454145D0352F}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RegexEditor", "Controls.RegexEditor\RegexEditor.vbproj", "{BCC6942F-CD4B-4B67-8200-1C0D002E7CC2}" @@ -126,8 +124,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ChatNewConv", "Controls.Cha EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ChatAddUser", "Controls.ChatAddUser\ChatAddUser.vbproj", "{F0A807CC-BE14-4B5B-9200-27C16156BD8A}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SearchIDB", "SearchIDB\SearchIDB.vbproj", "{29765A37-4EC5-447F-87CB-8385843FF4C4}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -202,10 +198,6 @@ Global {B65E24B3-D334-455D-A0BF-B33B8358B013}.Debug|Any CPU.Build.0 = Debug|Any CPU {B65E24B3-D334-455D-A0BF-B33B8358B013}.Release|Any CPU.ActiveCfg = Release|Any CPU {B65E24B3-D334-455D-A0BF-B33B8358B013}.Release|Any CPU.Build.0 = Release|Any CPU - {3D437957-B90B-4D8F-9219-6D19B0C90994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3D437957-B90B-4D8F-9219-6D19B0C90994}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3D437957-B90B-4D8F-9219-6D19B0C90994}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3D437957-B90B-4D8F-9219-6D19B0C90994}.Release|Any CPU.Build.0 = Release|Any CPU {D3C8CFED-D6F6-43A8-9BDF-454145D0352F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D3C8CFED-D6F6-43A8-9BDF-454145D0352F}.Debug|Any CPU.Build.0 = Debug|Any CPU {D3C8CFED-D6F6-43A8-9BDF-454145D0352F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -334,10 +326,6 @@ Global {F0A807CC-BE14-4B5B-9200-27C16156BD8A}.Debug|Any CPU.Build.0 = Debug|Any CPU {F0A807CC-BE14-4B5B-9200-27C16156BD8A}.Release|Any CPU.ActiveCfg = Release|Any CPU {F0A807CC-BE14-4B5B-9200-27C16156BD8A}.Release|Any CPU.Build.0 = Release|Any CPU - {29765A37-4EC5-447F-87CB-8385843FF4C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29765A37-4EC5-447F-87CB-8385843FF4C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {29765A37-4EC5-447F-87CB-8385843FF4C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {29765A37-4EC5-447F-87CB-8385843FF4C4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -360,7 +348,6 @@ Global {7386AB04-DF8D-4DFB-809D-1FAC8212CB7E} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} {926E6474-5613-4373-BB99-B101158B91EF} = {7AF3F9C2-C939-4A08-95C1-0453207E298A} {B65E24B3-D334-455D-A0BF-B33B8358B013} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} - {3D437957-B90B-4D8F-9219-6D19B0C90994} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB} {D3C8CFED-D6F6-43A8-9BDF-454145D0352F} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} {BCC6942F-CD4B-4B67-8200-1C0D002E7CC2} = {F98C0329-C004-417F-B2AB-7466E88D8220} {5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC} @@ -393,7 +380,6 @@ Global {4A726345-FD6B-4E1C-9E5D-18C9043D7714} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A} {86D27FFA-480F-481D-8D23-26DEAE92FE6C} = {F98C0329-C004-417F-B2AB-7466E88D8220} {F0A807CC-BE14-4B5B-9200-27C16156BD8A} = {F98C0329-C004-417F-B2AB-7466E88D8220} - {29765A37-4EC5-447F-87CB-8385843FF4C4} = {F98C0329-C004-417F-B2AB-7466E88D8220} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286} diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index 95128c8c..4632a7a7 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -108,8 +108,8 @@ Public Class frmDocumentResultList AddHandler GridView2.FocusedRowChanged, AddressOf GridView_FocusedRowChanged AddHandler GridView3.FocusedRowChanged, AddressOf GridView_FocusedRowChanged - UpdateTotalResults(_ResultLists) - UpdateGridData(_ResultLists) + UpdateTotalResults() + UpdateGridData() Catch ex As Exception _Logger.Error(ex) MessageBox.Show("Error while loading results:" & vbNewLine & vbNewLine & ex.Message, Text) @@ -200,8 +200,8 @@ Public Class frmDocumentResultList Public Function RefreshResults(pResults As IEnumerable(Of BaseResult)) As Boolean Implements IResultForm.RefreshResults _IsLoading = True Try - UpdateTotalResults(_ResultLists) - UpdateGridData(_ResultLists) + UpdateTotalResults() + UpdateGridData() Return True Catch ex As Exception @@ -213,7 +213,7 @@ Public Class frmDocumentResultList End Try End Function - Private Sub UpdateGridData(pResultList As List(Of DocumentResult)) + Private Sub UpdateGridData() ' Load Grids For index = 0 To _ResultLists.Count - 1 Select Case index @@ -267,10 +267,10 @@ Public Class frmDocumentResultList End Select End Sub - Private Sub UpdateTotalResults(pResultList As List(Of DocumentResult)) + Private Sub UpdateTotalResults() Dim oTotalResults = 0 - For Each oList In pResultList + For Each oList In _ResultLists oTotalResults += oList.Datatable.Rows.Count Next diff --git a/GUIs.Common/My Project/AssemblyInfo.vb b/GUIs.Common/My Project/AssemblyInfo.vb index 017cd2a3..fe2b51e3 100644 --- a/GUIs.Common/My Project/AssemblyInfo.vb +++ b/GUIs.Common/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/GUIs.ZooFlow/clsIDBData.vb b/GUIs.ZooFlow/ClassIDBData.vb similarity index 61% rename from GUIs.ZooFlow/clsIDBData.vb rename to GUIs.ZooFlow/ClassIDBData.vb index c6110976..68bb6c8b 100644 --- a/GUIs.ZooFlow/clsIDBData.vb +++ b/GUIs.ZooFlow/ClassIDBData.vb @@ -1,15 +1,12 @@ Imports DigitalData.Modules.Logging -Public Class clsIDBData - Public DTVWIDB_BE_ATTRIBUTE As DataTable +Public Class ClassIDBData + Public Property DTVWIDB_BE_ATTRIBUTE As DataTable ''' ''' Gets all indices by BusinessEntity. ''' ''' Title of Business Entity ''' Array with all Indices - ''' - ''' - Private _Logger As Logger Public Sub New(LogConfig As LogConfig) _Logger = LogConfig.GetLogger @@ -17,85 +14,69 @@ Public Class clsIDBData DTVWIDB_BE_ATTRIBUTE = My.DatabaseIDB.GetDatatable(oSQL) End Sub Public IDBSystemIndices As List(Of String) - Public Function GetIndicesByBE(ByVal BusinessEntity As String) As String() + Public Function GetIndicesByBE(ByVal pBusinessEntity As String) As List(Of String) Try - Dim aNames(4) As String - aNames(0) = "ObjectID" - aNames(1) = "IDBCreatedWhen" - aNames(2) = "IDBCreatedWho" - aNames(3) = "IDBChangedWhen" - aNames(4) = "IDBChangedWho" - IDBSystemIndices = aNames.ToList - ' Array für Indizes vorbereiten - Dim aIndexNames(DTVWIDB_BE_ATTRIBUTE.Rows.Count + 4) As String - Dim oCount As Integer = 0 - aIndexNames(oCount) = "ObjectID" - oCount += 1 - aIndexNames(oCount) = "IDBCreatedWhen" - oCount += 1 - aIndexNames(oCount) = "IDBCreatedWho" - oCount += 1 - aIndexNames(oCount) = "IDBChangedWhen" - oCount += 1 - aIndexNames(oCount) = "IDBChangedWho" - For Each oRow As DataRow In DTVWIDB_BE_ATTRIBUTE.Rows - oCount += 1 - aIndexNames(oCount) = oRow.Item("ATTR_TITLE") + IDBSystemIndices = New List(Of String) From { + "ObjectID", "IDBCreatedWhen", "IDBCreatedWho", "IDBChangedWhen", "IDBChangedWho" + } + Dim oIndexNames As New List(Of String) + oIndexNames.AddRange(IDBSystemIndices.ToArray) + + For Each oRow As DataRow In DTVWIDB_BE_ATTRIBUTE.Rows + oIndexNames.Add(oRow.Item("ATTR_TITLE").ToString) Next + oIndexNames.Sort() - ' Indexarray sortiert zurückgeben - Array.Sort(aIndexNames) - ' Indexarray zurückgeben - Return aIndexNames - + Return oIndexNames Catch ex As Exception _Logger.Error(ex) MsgBox(ex.Message, MsgBoxStyle.Critical, "Error getting the IDB Indicies") Return Nothing End Try End Function - Public Function GetTypeOfIndex(ByVal indexname As String) As Integer + Public Function GetTypeOfIndex(ByVal pIndexname As String) As Integer Try For Each oRow As DataRow In DTVWIDB_BE_ATTRIBUTE.Rows - If oRow.Item("ATTR_TITLE") = indexname Then - Dim oType = oRow.Item("TYP_ID") - Return oType + If oRow.Item("ATTR_TITLE").ToString = pIndexname Then + Return Integer.Parse(oRow.Item("TYP_ID").ToString) End If Next - Catch ex As Exception _Logger.Error(ex) Return Nothing End Try - End Function - Public Function GetVariableValue(oAttributeName As String, Optional oIDBTyp As Integer = 0, Optional FromIDB As Boolean = False) As Object + + Public Function GetVariableValue(pAttributeName As String, Optional pIDBType As Integer = 0, Optional pFromIDB As Boolean = False) As Object Try - Dim oSingleAttribute As Boolean = True - Select Case oIDBTyp + Dim oSingleAttribute As Boolean + Select Case pIDBType Case 8 oSingleAttribute = False Case 9 oSingleAttribute = False + Case Else + oSingleAttribute = True End Select - Dim oAttributeValue + + Dim oAttributeValue As Object = Nothing If Not IsNothing(My.Application.IDB_DT_DOC_DATA) Then - If oSingleAttribute = True And My.Application.IDB_DT_DOC_DATA.Rows.Count = 1 And FromIDB = False Then + If oSingleAttribute = True And My.Application.IDB_DT_DOC_DATA.Rows.Count = 1 And pFromIDB = False Then Try - If oAttributeName = "IDBCreatedWhen" Then - oAttributeName = "ADDED_WHEN" - ElseIf oAttributeName = "IDBCreatedWho" Then - oAttributeName = "ADDED_WHO" - ElseIf oAttributeName = "IDBChangedWhen" Then - oAttributeName = "CHANGED_WHEN" - ElseIf oAttributeName = "IDBChangedWho" Then - oAttributeName = "CHANGED_WHO" + If pAttributeName = "IDBCreatedWhen" Then + pAttributeName = "ADDED_WHEN" + ElseIf pAttributeName = "IDBCreatedWho" Then + pAttributeName = "ADDED_WHO" + ElseIf pAttributeName = "IDBChangedWhen" Then + pAttributeName = "CHANGED_WHEN" + ElseIf pAttributeName = "IDBChangedWho" Then + pAttributeName = "CHANGED_WHO" End If - oAttributeValue = My.Application.IDB_DT_DOC_DATA.Rows(0).Item(oAttributeName) + oAttributeValue = My.Application.IDB_DT_DOC_DATA.Rows(0).Item(pAttributeName) Catch ex As Exception _Logger.Debug($"Error getting Attribute from IDB_DT_DOC_DATA: {ex.Message}") End Try @@ -106,57 +87,51 @@ Public Class clsIDBData If Not IsNothing(oAttributeValue) Then Return oAttributeValue Else - _Logger.Debug($"oAttributeValue for Attribute [{oAttributeName}] is so far nothing..Now trying FNIDB_PM_GET_VARIABLE_VALUE ") + _Logger.Debug($"oAttributeValue for Attribute [{pAttributeName}] is so far nothing..Now trying FNIDB_PM_GET_VARIABLE_VALUE ") End If - Dim oFNSQL = $"SELECT * FROM [dbo].[FNIDB_PM_GET_VARIABLE_VALUE] ({My.Application.Globix.CURRENT_DOC_ID},'{oAttributeName}','{My.Application.User.Language}',CONVERT(BIT,'0'))" - oAttributeValue = My.DatabaseIDB.GetDatatable(oFNSQL) - Dim odt As DataTable = oAttributeValue - If odt.Rows.Count = 1 Then - oAttributeValue = odt.Rows(0).Item(0) + Dim oFNSQL = $"SELECT * FROM [dbo].[FNIDB_PM_GET_VARIABLE_VALUE] ({My.Application.Globix.CURRENT_DOC_ID},'{pAttributeName}','{My.Application.User.Language}',CONVERT(BIT,'0'))" + Dim oDatatable As DataTable = My.DatabaseIDB.GetDatatable(oFNSQL) + If oDatatable.Rows.Count = 1 Then + oAttributeValue = oDatatable.Rows(0).Item(0) End If Return oAttributeValue Catch ex As Exception _Logger.Error(ex) Return Nothing End Try - End Function - Public Function Delete_Term_Object_From_Metadata(oAttributeName As String, oTerm2Delete As String) As Object + Public Function Delete_Term_Object_From_Metadata(pAttributeName As String, pTerm2Delete As String) As Object Try - Dim oAttributeValue - Dim oID_IS_FOREIGN As Integer - oID_IS_FOREIGN = 1 - Dim oDELSQL = $"EXEC PRIDB_DELETE_TERM_OBJECT_METADATA {My.Application.Globix.CURRENT_DOC_ID},'{oAttributeName}','{oTerm2Delete}','{My.Application.User.UserName}','{My.Application.User.Language}',{oID_IS_FOREIGN}" + Dim oIdIsForeign As Integer = 1 + Dim oDELSQL = $"EXEC PRIDB_DELETE_TERM_OBJECT_METADATA {My.Application.Globix.CURRENT_DOC_ID},'{pAttributeName}','{pTerm2Delete}','{My.Application.User.UserName}','{My.Application.User.Language}',{oIdIsForeign}" My.DatabaseIDB.ExecuteNonQuery(oDELSQL) Catch ex As Exception _Logger.Error(ex) Return Nothing End Try - End Function - Public Function Delete_AttributeData(pIDB_OBJID As Int64, pAttributeName As String) As Object + Public Function Delete_AttributeData(pObjectId As Int64, pAttributeName As String) As Object Try - Dim oDELSQL = $"EXEC PRIDB_DELETE_ATTRIBUTE_DATA {pIDB_OBJID},'{pAttributeName}','{My.Application.User.UserName}'" + Dim oDELSQL = $"EXEC PRIDB_DELETE_ATTRIBUTE_DATA {pObjectId},'{pAttributeName}','{My.Application.User.UserName}'" My.DatabaseIDB.ExecuteNonQuery(oDELSQL) Catch ex As Exception _Logger.Error(ex) Return Nothing End Try - End Function - Public Function SetVariableValue(oAttributeName As String, oNewValue As Object, Optional CheckDeleted As Boolean = False, Optional oIDBTyp As Integer = 0) + Public Function SetVariableValue(pAttributeName As String, pNewValue As Object, Optional pCheckDeleted As Boolean = False, Optional oIDBTyp As Integer = 0) As Boolean Try - Dim omytype = oNewValue.GetType.ToString - If omytype = "System.Data.DataTable" Then - Dim oDTMyNewValues As DataTable = oNewValue - Dim oOldAttributeResult - Dim oTypeOldResult + Dim oType = pNewValue.GetType.ToString + If oType = "System.Data.DataTable" Then + Dim oDTMyNewValues As DataTable = pNewValue + Dim oOldAttributeResult As Object + Dim oTypeOldResult As Object - If CheckDeleted = True Then - oOldAttributeResult = GetVariableValue(oAttributeName, oIDBTyp) + If pCheckDeleted = True Then + oOldAttributeResult = GetVariableValue(pAttributeName, oIDBTyp) oTypeOldResult = oOldAttributeResult.GetType.ToString If oTypeOldResult = "System.Data.DataTable" Then Dim myOldValues As DataTable = oOldAttributeResult @@ -174,10 +149,10 @@ Public Class clsIDBData Next If oExists = False Then - Dim oInfo = $"Value [{oOldValueRow.Item(0)}] no longer existing in Vector-Attribute [{oAttributeName}] - will be deleted!" + Dim oInfo = $"Value [{oOldValueRow.Item(0)}] no longer existing in Vector-Attribute [{pAttributeName}] - will be deleted!" _Logger.Info(oInfo) SetVariableValue(My.Application.Globix.CURRENT_PROFILE_LOG_INDEX, oInfo) - Delete_Term_Object_From_Metadata(oAttributeName, oOldValueRow.Item(0)) + Delete_Term_Object_From_Metadata(pAttributeName, oOldValueRow.Item(0)) End If Next @@ -193,16 +168,16 @@ Public Class clsIDBData End If Next If oExists = False Then - Dim oInfo2 = $"Value [{oOldAttributeResult}] no longer existing in Vector-Attribute [{oAttributeName}] - will be deleted!" + Dim oInfo2 = $"Value [{oOldAttributeResult}] no longer existing in Vector-Attribute [{pAttributeName}] - will be deleted!" _Logger.Info(oInfo2) SetVariableValue(My.Application.Globix.CURRENT_PROFILE_LOG_INDEX, oInfo2) - Delete_Term_Object_From_Metadata(oAttributeName, oOldAttributeResult) + Delete_Term_Object_From_Metadata(pAttributeName, oOldAttributeResult) End If Else - Dim oInfo = $"Value [{oOldAttributeResult}] of Attribute [{oAttributeName}] obviously was updated during runtime - will be deleted!" + Dim oInfo = $"Value [{oOldAttributeResult}] of Attribute [{pAttributeName}] obviously was updated during runtime - will be deleted!" _Logger.Info(oInfo) SetVariableValue(My.Application.Globix.CURRENT_PROFILE_LOG_INDEX, oInfo) - Delete_Term_Object_From_Metadata(oAttributeName, oOldAttributeResult) + Delete_Term_Object_From_Metadata(pAttributeName, oOldAttributeResult) End If End If @@ -211,7 +186,7 @@ Public Class clsIDBData For Each oNewValueRow As DataRow In oDTMyNewValues.Rows Dim oSuccess As Boolean = False - Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {My.Application.Globix.CURRENT_DOC_ID},'{oAttributeName}','{My.Application.User.UserName}','{oNewValueRow.Item(1).ToString}','{My.Application.User.Language}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" + Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {My.Application.Globix.CURRENT_DOC_ID},'{pAttributeName}','{My.Application.User.UserName}','{oNewValueRow.Item(1).ToString}','{My.Application.User.Language}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" oSuccess = My.DatabaseIDB.ExecuteNonQuery(oFNSQL) If oSuccess = False Then Return False @@ -219,7 +194,7 @@ Public Class clsIDBData Next Return True Else - Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {My.Application.Globix.CURRENT_DOC_ID},'{oAttributeName}','{My.Application.User.UserName}','{oNewValue}','{My.Application.User.Language}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" + Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {My.Application.Globix.CURRENT_DOC_ID},'{pAttributeName}','{My.Application.User.UserName}','{pNewValue}','{My.Application.User.Language}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" Return My.DatabaseIDB.ExecuteNonQuery(oFNSQL) End If diff --git a/GUIs.ZooFlow/Globix/ClassFileDrop.vb b/GUIs.ZooFlow/Globix/ClassFileDrop.vb index 2f808b6f..ea359e99 100644 --- a/GUIs.ZooFlow/Globix/ClassFileDrop.vb +++ b/GUIs.ZooFlow/Globix/ClassFileDrop.vb @@ -94,7 +94,7 @@ Public Class ClassFileDrop End If End If If e.Data.GetDataPresent("FileGroupDescriptor") Then - Dim oApp + Dim oApp As Outlook.Application Try oApp = New Outlook.Application() Catch ex As Exception diff --git a/GUIs.ZooFlow/Globix/GlobixPatterns.vb b/GUIs.ZooFlow/Globix/GlobixPatterns.vb index 26cda783..69150408 100644 --- a/GUIs.ZooFlow/Globix/GlobixPatterns.vb +++ b/GUIs.ZooFlow/Globix/GlobixPatterns.vb @@ -5,10 +5,10 @@ Imports DigitalData.Modules.Logging Public Class GlobixPatterns Private _Logger As Logger - Private _idbdata As clsIDBData + Private _idbdata As ClassIDBData Public Sub New(LogConfig As LogConfig) _Logger = LogConfig.GetLogger - _idbdata = New clsIDBData(LogConfig) + _idbdata = New ClassIDBData(LogConfig) End Sub ' Complex patterns that rely on a datasource like a Database or Windream Public Const PATTERN_WMI = "WMI" @@ -261,12 +261,12 @@ Public Class GlobixPatterns End Function Public Function ReplaceIDBAttributes(IDB_OBJ_ID As Long, pInput As String, IS_SQL As Boolean) As String Try - Dim result = pInput + Dim oResult = pInput Dim oTryCounter As Integer = 0 - While ContainsPattern(result, PATTERN_IDBA) + While ContainsPattern(oResult, PATTERN_IDBA) - Dim indexName As String = GetNextPattern(result, PATTERN_IDBA).Value - Dim oIDBValue + Dim indexName As String = GetNextPattern(oResult, PATTERN_IDBA).Value + Dim oIDBValue As Object If indexName = "ObjectID" Then oIDBValue = IDB_OBJ_ID ElseIf indexName = "OBJID" Then @@ -280,7 +280,7 @@ Public Class GlobixPatterns If IsNothing(oIDBValue) And oTryCounter = MAX_TRY_COUNT Then _Logger.Warn($"Max tries for [{indexName}] in ReplaceIDBAttributes exceeded - Replacing with [0]!") Dim oReplaceValue = "{" + $"#{PATTERN_IDBA}#{indexName}" + "}" - result = result.Replace(oReplaceValue, 0) + oResult = oResult.Replace(oReplaceValue, 0) Throw New Exception("Max tries in ReplaceIDBAttributes exceeded.") End If @@ -299,87 +299,24 @@ Public Class GlobixPatterns End If _Logger.Debug($"oIDBValue = {oIDBValue}") End If - result = result.Replace(oReplaceValue, oIDBValue) + oResult = oResult.Replace(oReplaceValue, oIDBValue) Else _Logger.Warn($"IDBValue for [{indexName}] in ReplaceIDBAttributes is nothing or dbnull - Replacing with [0]!") Dim oReplaceValue = "{" + $"#{PATTERN_IDBA}#{indexName}" + "}" - result = result.Replace(oReplaceValue, 0) + oResult = oResult.Replace(oReplaceValue, 0) End If oTryCounter += 100 End While _Logger.Debug("sql after ReplaceIDBAttributes: " & pInput) - Return result + Return oResult Catch ex As Exception _Logger.Error(ex) _Logger.Info("Error in ReplaceIDBAttributes:" & ex.Message) + Return pInput End Try End Function - 'Public Function ReplaceWindreamIndicies(input As String, document As WMObject) As String - ' Try - ' Dim result = input - ' Dim oTryCounter As Integer = 0 - ' While ContainsPattern(result, PATTERN_WMI) - - ' Dim indexName As String = GetNextPattern(result, PATTERN_WMI).Value - ' Dim oWMValue = document.GetVariableValue(indexName) - ' If IsNothing(oWMValue) And oTryCounter = MAX_TRY_COUNT Then - ' _Logger.Warn("Exit from ReplaceWindreamIndicies as oWMValue is still nothing and oTryCounter is 500!") - ' Throw New Exception("Max tries in ReplaceWindreamIndicies exceeded.") - - ' End If - ' If oWMValue IsNot Nothing Then - ' result = ReplacePattern(result, PATTERN_WMI, oWMValue) - ' End If - ' oTryCounter += 100 - ' End While - ' _Logger.Debug("sql after ReplaceWindreamIndicies: " & input) - ' Return result - ' Catch ex As Exception - ' _Logger.Error(ex) - ' _Logger.Info("Error in ReplaceWindreamIndicies:" & ex.Message) - ' End Try - 'End Function - 'Public Function ReplaceIDBAttributes(input As String) As String - ' Try - ' Dim result = input - ' Dim oTryCounter As Integer = 0 - ' While ContainsPattern(result, PATTERN_IDBA) - - ' Dim indexName As String = GetNextPattern(result, PATTERN_IDBA).Value - ' Dim oIDBValue - ' If indexName = "ObjectID" Then - ' oIDBValue = CURRENT_DOC_ID - ' ElseIf indexName = "OBJID" Then - ' oIDBValue = CURRENT_DOC_ID - ' ElseIf indexName = "DocID" Then - ' oIDBValue = CURRENT_DOC_ID - ' Else - - ' oIDBValue = IDBData.GetVariableValue(indexName) - ' End If - - ' If IsNothing(oIDBValue) And oTryCounter = MAX_TRY_COUNT Then - ' _Logger.Warn("Exit from ReplaceIDBIndicies as Value is still nothing and oTryCounter is 500!") - ' Throw New Exception("Max tries in ReplaceIDBAttributes exceeded.") - - ' End If - ' If oIDBValue IsNot Nothing Then - ' Dim oReplaceValue = "{" + $"#{PATTERN_IDBA}#{indexName}" + "}" - ' result = result.Replace(oReplaceValue, oIDBValue) - ' 'result = ReplacePattern(result, oReplaceValue, oIDBValue) - ' End If - ' oTryCounter += 100 - ' End While - ' _Logger.Debug("sql after ReplaceIDBAttributes: " & input) - ' Return result - ' Catch ex As Exception - ' _Logger.Error(ex) - ' _Logger.Info("Error in ReplaceIDBAttributes:" & ex.Message) - ' End Try - 'End Function - - Private Function ContainsPattern(input As String, type As String) As String + Private Function ContainsPattern(input As String, type As String) As Boolean Dim elements As MatchCollection = myregex.Matches(input) For Each element As Match In elements @@ -459,9 +396,9 @@ Public Class GlobixPatterns Return False End Function - Public Function HasAnyPatterns(input) As Boolean + Public Function HasAnyPatterns(pInput As String) As Boolean Return allPatterns.Any(Function(p) - Return HasPattern(input, p) + Return HasPattern(pInput, p) End Function) End Function diff --git a/GUIs.ZooFlow/Globix/frmGlobix_Index.vb b/GUIs.ZooFlow/Globix/frmGlobix_Index.vb index 5971370a..dbb6166d 100644 --- a/GUIs.ZooFlow/Globix/frmGlobix_Index.vb +++ b/GUIs.ZooFlow/Globix/frmGlobix_Index.vb @@ -1,10 +1,11 @@ -Imports System.IO +Option Explicit On + +Imports System.IO Imports System.Security.AccessControl Imports System.Security.Principal Imports System.Text.RegularExpressions Imports DigitalData.Modules.Logging - Public Class frmGlobix_Index #Region "+++++ Variablen ++++++" Public vPathFile As String @@ -1547,17 +1548,17 @@ Public Class frmGlobix_Index Function Indexwert_checkValueDB(indexname As String, wert As String) Try - Dim DR As DataRow + Dim oRow As DataRow 'DT = DD_DMSLiteDataSet.VWINDEX_MAN - For Each DR In DT_INDEXEMAN.Rows - If DR.Item("NAME") = indexname Then - If DR.Item("SQL_CHECK").ToString <> String.Empty Then + For Each oRow In DT_INDEXEMAN.Rows + If oRow.Item("NAME") = indexname Then + If oRow.Item("SQL_CHECK").ToString <> String.Empty Then Dim connectionString As String Dim sql As String - connectionString = My.Database.Get_ConnectionStringforID(DR.Item("CONNECTION_ID")) + connectionString = My.Database.Get_ConnectionStringforID(oRow.Item("CONNECTION_ID")) If connectionString <> "" Then - Dim sqlscalar = DR.Item("SQL_CHECK") - Select Case DR.Item("DATENTYP") + Dim sqlscalar = oRow.Item("SQL_CHECK") + Select Case oRow.Item("DATENTYP") Case "INTEGER" sqlscalar = sqlscalar.ToString.Replace("@manValue", wert) Case Else diff --git a/GUIs.ZooFlow/Globix/frmGlobix_IndexFileList.Designer.vb b/GUIs.ZooFlow/Globix/frmGlobix_IndexFileList.Designer.vb index 6a0810e3..cb6d91be 100644 --- a/GUIs.ZooFlow/Globix/frmGlobix_IndexFileList.Designer.vb +++ b/GUIs.ZooFlow/Globix/frmGlobix_IndexFileList.Designer.vb @@ -46,7 +46,7 @@ Partial Class frmGlobix_IndexFileList Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl1.Size = New System.Drawing.Size(617, 159) + Me.RibbonControl1.Size = New System.Drawing.Size(617, 157) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonItem1 @@ -116,9 +116,9 @@ Partial Class frmGlobix_IndexFileList ' Me.CheckedListBox1.Dock = System.Windows.Forms.DockStyle.Fill Me.CheckedListBox1.FormattingEnabled = True - Me.CheckedListBox1.Location = New System.Drawing.Point(0, 159) + Me.CheckedListBox1.Location = New System.Drawing.Point(0, 157) Me.CheckedListBox1.Name = "CheckedListBox1" - Me.CheckedListBox1.Size = New System.Drawing.Size(617, 216) + Me.CheckedListBox1.Size = New System.Drawing.Size(617, 218) Me.CheckedListBox1.TabIndex = 2 ' 'frmGlobix_IndexFileList diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.vb b/GUIs.ZooFlow/Search/frmFlowSearch.vb index 1e5fecec..246509a5 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch.vb @@ -152,7 +152,7 @@ Public Class frmFlowSearch Private Function GetResultFormSize() As Size Return Size End Function - Private Function GetResultString(CountObjects, CountAttribute, SearchContent) As String + Private Function GetResultString(CountObjects As Integer, CountAttribute As Integer, SearchContent As String) As String Dim oResultString = $"wurden {CountObjects} Objekte" ' IIf(CountAttribute = 1, $"wurden {CountObjects} Objekte", $"wurden {CountObjects} Objekte in {CountAttribute} Attributen") Dim oProfileString = IIf(CountAttribute = 1, "einem Attribut", $"{CountAttribute} Attributen") Dim oBase = "Es {0} in {1} für Ihre Suche nach '{2}' gefunden:" diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 706efe9b..013afe23 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -128,7 +128,7 @@ - + True True diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 057e3961..9c3bcd5d 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -1,4 +1,6 @@ -Imports System.IO +Option Explicit On + +Imports System.IO Imports DevExpress.XtraSplashScreen Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Messaging diff --git a/LoggerDiag/App.config b/LoggerDiag/App.config deleted file mode 100644 index 5534e287..00000000 --- a/LoggerDiag/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/LoggerDiag/DummyConfig.vb b/LoggerDiag/DummyConfig.vb deleted file mode 100644 index 8fe9c12d..00000000 --- a/LoggerDiag/DummyConfig.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class DummyConfig - Public SomeSetting As String = "Default_Value" -End Class diff --git a/LoggerDiag/MonoDiag.vbproj b/LoggerDiag/MonoDiag.vbproj deleted file mode 100644 index c374a4ff..00000000 --- a/LoggerDiag/MonoDiag.vbproj +++ /dev/null @@ -1,151 +0,0 @@ - - - - - Debug - AnyCPU - {3D437957-B90B-4D8F-9219-6D19B0C90994} - WinExe - MonoDiag.My.MyApplication - MonoDiag - MonoDiag - 512 - WindowsForms - v4.6.1 - true - - - AnyCPU - true - full - true - true - bin\Debug\ - MonoDiag.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - AnyCPU - pdbonly - false - true - true - bin\Release\ - MonoDiag.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - - - - - - - - - - - - ..\packages\NLog.4.5.11\lib\net45\NLog.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - frmMain.vb - Form - - - - True - Application.myapp - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - frmMain.vb - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - - - {44982f9b-6116-44e2-85d0-f39650b1ef99} - Config - - - {903b2d7d-3b80-4be9-8713-7447b704e1b0} - Logging - - - - \ No newline at end of file diff --git a/LoggerDiag/My Project/Application.Designer.vb b/LoggerDiag/My Project/Application.Designer.vb deleted file mode 100644 index a12c37f8..00000000 --- a/LoggerDiag/My Project/Application.Designer.vb +++ /dev/null @@ -1,38 +0,0 @@ -'------------------------------------------------------------------------------ -' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 -' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My - - '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. - ' - Partial Friend Class MyApplication - - _ - Public Sub New() - MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) - Me.IsSingleInstance = false - Me.EnableVisualStyles = true - Me.SaveMySettingsOnExit = true - Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses - End Sub - - _ - Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.MonoDiag.frmMain - End Sub - End Class -End Namespace diff --git a/LoggerDiag/My Project/Application.myapp b/LoggerDiag/My Project/Application.myapp deleted file mode 100644 index 739ea6fe..00000000 --- a/LoggerDiag/My Project/Application.myapp +++ /dev/null @@ -1,10 +0,0 @@ - - - true - frmMain - false - 0 - true - 0 - true - \ No newline at end of file diff --git a/LoggerDiag/My Project/AssemblyInfo.vb b/LoggerDiag/My Project/AssemblyInfo.vb deleted file mode 100644 index 5af86104..00000000 --- a/LoggerDiag/My Project/AssemblyInfo.vb +++ /dev/null @@ -1,35 +0,0 @@ -Imports System -Imports System.Reflection -Imports System.Runtime.InteropServices - -' Allgemeine Informationen über eine Assembly werden über die folgenden -' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -' die einer Assembly zugeordnet sind. - -' Werte der Assemblyattribute überprüfen - - - - - - - - - - -'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird. - - -' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -' -' Hauptversion -' Nebenversion -' Buildnummer -' Revision -' -' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, -' übernehmen, indem Sie "*" eingeben: -' - - - diff --git a/LoggerDiag/My Project/Resources.Designer.vb b/LoggerDiag/My Project/Resources.Designer.vb deleted file mode 100644 index b31b1912..00000000 --- a/LoggerDiag/My Project/Resources.Designer.vb +++ /dev/null @@ -1,63 +0,0 @@ -'------------------------------------------------------------------------------ -' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 -' -' Ä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 - - '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. - ''' - ''' 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 - - ''' - ''' 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 - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("MonoDiag.Resources", GetType(Resources).Assembly) - resourceMan = temp - End If - Return resourceMan - End Get - End Property - - ''' - ''' Ü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 - resourceCulture = value - End Set - End Property - End Module -End Namespace diff --git a/LoggerDiag/My Project/Resources.resx b/LoggerDiag/My Project/Resources.resx deleted file mode 100644 index af7dbebb..00000000 --- a/LoggerDiag/My Project/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/LoggerDiag/My Project/Settings.Designer.vb b/LoggerDiag/My Project/Settings.Designer.vb deleted file mode 100644 index b2d12459..00000000 --- a/LoggerDiag/My Project/Settings.Designer.vb +++ /dev/null @@ -1,73 +0,0 @@ -'------------------------------------------------------------------------------ -' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 -' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. -' -'------------------------------------------------------------------------------ - -Option Strict On -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 "Automatische My.Settings-Speicherfunktion" -#If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean - - Private Shared addedHandlerLockObject As New Object - - _ - 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 -#End If - Return defaultInstance - End Get - End Property - End Class -End Namespace - -Namespace My - - _ - Friend Module MySettingsProperty - - _ - Friend ReadOnly Property Settings() As Global.MonoDiag.My.MySettings - Get - Return Global.MonoDiag.My.MySettings.Default - End Get - End Property - End Module -End Namespace diff --git a/LoggerDiag/My Project/Settings.settings b/LoggerDiag/My Project/Settings.settings deleted file mode 100644 index 85b890b3..00000000 --- a/LoggerDiag/My Project/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/LoggerDiag/My Project/licenses.licx b/LoggerDiag/My Project/licenses.licx deleted file mode 100644 index 824a99fc..00000000 --- a/LoggerDiag/My Project/licenses.licx +++ /dev/null @@ -1 +0,0 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/LoggerDiag/frmMain.Designer.vb b/LoggerDiag/frmMain.Designer.vb deleted file mode 100644 index 14cf6f4f..00000000 --- a/LoggerDiag/frmMain.Designer.vb +++ /dev/null @@ -1,122 +0,0 @@ - _ -Partial Class frmMain - Inherits System.Windows.Forms.Form - - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Wird vom Windows Form-Designer benötigt. - Private components As System.ComponentModel.IContainer - - 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. - 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. - 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ - Private Sub InitializeComponent() - Me.GridControlLogs = New DevExpress.XtraGrid.GridControl() - Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.btnRefresh = New System.Windows.Forms.Button() - Me.Button1 = New System.Windows.Forms.Button() - Me.TextBox1 = New System.Windows.Forms.TextBox() - Me.Label1 = New System.Windows.Forms.Label() - Me.Button2 = New System.Windows.Forms.Button() - CType(Me.GridControlLogs, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'GridControlLogs - ' - Me.GridControlLogs.Dock = System.Windows.Forms.DockStyle.Right - Me.GridControlLogs.Location = New System.Drawing.Point(251, 0) - Me.GridControlLogs.MainView = Me.GridView1 - Me.GridControlLogs.Name = "GridControlLogs" - Me.GridControlLogs.Size = New System.Drawing.Size(888, 679) - Me.GridControlLogs.TabIndex = 0 - Me.GridControlLogs.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) - ' - 'GridView1 - ' - Me.GridView1.GridControl = Me.GridControlLogs - Me.GridView1.Name = "GridView1" - ' - 'btnRefresh - ' - Me.btnRefresh.Location = New System.Drawing.Point(12, 12) - Me.btnRefresh.Name = "btnRefresh" - Me.btnRefresh.Size = New System.Drawing.Size(233, 35) - Me.btnRefresh.TabIndex = 1 - Me.btnRefresh.Text = "Refresh Logs" - Me.btnRefresh.UseVisualStyleBackColor = True - ' - 'Button1 - ' - Me.Button1.Location = New System.Drawing.Point(12, 53) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(233, 32) - Me.Button1.TabIndex = 2 - Me.Button1.Text = "Read Config" - Me.Button1.UseVisualStyleBackColor = True - ' - 'TextBox1 - ' - Me.TextBox1.Location = New System.Drawing.Point(12, 143) - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(233, 20) - Me.TextBox1.TabIndex = 3 - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(9, 127) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(109, 13) - Me.Label1.TabIndex = 4 - Me.Label1.Text = "Value of Test-Setting:" - ' - 'Button2 - ' - Me.Button2.Location = New System.Drawing.Point(12, 91) - Me.Button2.Name = "Button2" - Me.Button2.Size = New System.Drawing.Size(233, 33) - Me.Button2.TabIndex = 5 - Me.Button2.Text = "Save Config" - Me.Button2.UseVisualStyleBackColor = True - ' - 'frmMain - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1139, 679) - Me.Controls.Add(Me.Button2) - Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.TextBox1) - Me.Controls.Add(Me.Button1) - Me.Controls.Add(Me.btnRefresh) - Me.Controls.Add(Me.GridControlLogs) - Me.MinimumSize = New System.Drawing.Size(1155, 718) - Me.Name = "frmMain" - Me.Text = "Digital Data Diagnose" - CType(Me.GridControlLogs, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - - Friend WithEvents GridControlLogs As DevExpress.XtraGrid.GridControl - Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents btnRefresh As Button - Friend WithEvents Button1 As Button - Friend WithEvents TextBox1 As TextBox - Friend WithEvents Label1 As Label - Friend WithEvents Button2 As Button -End Class diff --git a/LoggerDiag/frmMain.resx b/LoggerDiag/frmMain.resx deleted file mode 100644 index 1af7de15..00000000 --- a/LoggerDiag/frmMain.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/LoggerDiag/frmMain.vb b/LoggerDiag/frmMain.vb deleted file mode 100644 index 2fc491b3..00000000 --- a/LoggerDiag/frmMain.vb +++ /dev/null @@ -1,62 +0,0 @@ -Imports System.IO -Imports DigitalData.Modules.Config -Imports DigitalData.Modules.Logging - -Public Class frmMain - Public LogConfig As LogConfig - Public Logger As Logger - Public Config As ConfigManager(Of DummyConfig) - - - Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load - LogConfig = New LogConfig(LogConfig.PathType.AppData) With { - .Debug = True - } - - Dim productName As String = My.Application.Info.ProductName - Dim companyName As String = My.Application.Info.CompanyName - - Dim appDataDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) - Dim basePath = Path.Combine(appDataDir, companyName, productName, "Log") - - Logger = LogConfig.GetLogger() - Logger.Info("Initializing Config") - Logger.Info("Logging Path: {0}", basePath) - Logger.Info("UserConfig.xml Path: {0}", Application.UserAppDataPath) - Logger.Info("ComputerConfig.xml Path: {0}", Application.CommonAppDataPath) - - Config = New ConfigManager(Of DummyConfig)(LogConfig, Application.UserAppDataPath, Application.CommonAppDataPath) - - RefreshLogs() - End Sub - - Private Sub RefreshLogs() - GridControlLogs.DataSource = LogConfig.Logs - End Sub - - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnRefresh.Click - RefreshLogs() - End Sub - - Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click - Try - Logger.Info("Value of TestSetting is: {0}", Config.Config.SomeSetting) - TextBox1.Text = Config.Config.SomeSetting - RefreshLogs() - Catch ex As Exception - Logger.Error(ex) - RefreshLogs() - End Try - End Sub - - Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click - Try - Config.Config.SomeSetting = TextBox1.Text - Config.Save() - RefreshLogs() - Catch ex As Exception - Logger.Error(ex) - RefreshLogs() - End Try - End Sub -End Class diff --git a/LoggerDiag/packages.config b/LoggerDiag/packages.config deleted file mode 100644 index f89fa324..00000000 --- a/LoggerDiag/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb index c4245f40..e9d9f6a6 100644 --- a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb +++ b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb @@ -229,7 +229,7 @@ Public Class ImportZUGFeRDFiles oMD5CheckSum = CreateMD5(oFile.FullName) If oMD5CheckSum <> String.Empty Then Dim oCheckCommand = $"SELECT * FROM TBEDM_ZUGFERD_HISTORY_IN WHERE GUID = (SELECT MAX(GUID) FROM TBEDM_ZUGFERD_HISTORY_IN WHERE UPPER(MD5HASH) = UPPER('{oMD5CheckSum}'))" - Dim oMD5DT As DataTable = _firebird.GetDatatable(oCheckCommand, Firebird.TransactionMode.ExternalTransaction, oTransaction) + Dim oMD5DT As DataTable = _firebird.GetDatatable(oCheckCommand, Firebird.TransactionMode.NoTransaction) If Not IsNothing(oMD5DT) Then If oMD5DT.Rows.Count = 1 Then Dim oRejected As Boolean diff --git a/Modules.Jobs/My Project/AssemblyInfo.vb b/Modules.Jobs/My Project/AssemblyInfo.vb index 8c8ff3e5..5b65e562 100644 --- a/Modules.Jobs/My Project/AssemblyInfo.vb +++ b/Modules.Jobs/My Project/AssemblyInfo.vb @@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern ' übernehmen, indem Sie "*" eingeben: - - + + diff --git a/SearchIDB/App.config b/SearchIDB/App.config deleted file mode 100644 index cd714553..00000000 --- a/SearchIDB/App.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SearchIDB/My Project/Application.Designer.vb b/SearchIDB/My Project/Application.Designer.vb deleted file mode 100644 index 7d042d50..00000000 --- a/SearchIDB/My Project/Application.Designer.vb +++ /dev/null @@ -1,38 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My - - 'NOTE: This file is auto-generated; do not modify it directly. To make changes, - ' or if you encounter build errors in this file, go to the Project Designer - ' (go to Project Properties or double-click the My Project node in - ' Solution Explorer), and make changes on the Application tab. - ' - Partial Friend Class MyApplication - - _ - Public Sub New() - MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) - Me.IsSingleInstance = false - Me.EnableVisualStyles = true - Me.SaveMySettingsOnExit = true - Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses - End Sub - - _ - Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.SearchIDB.Form1 - End Sub - End Class -End Namespace diff --git a/SearchIDB/My Project/Application.myapp b/SearchIDB/My Project/Application.myapp deleted file mode 100644 index 1243847f..00000000 --- a/SearchIDB/My Project/Application.myapp +++ /dev/null @@ -1,11 +0,0 @@ - - - true - Form1 - false - 0 - true - 0 - 0 - true - diff --git a/SearchIDB/My Project/AssemblyInfo.vb b/SearchIDB/My Project/AssemblyInfo.vb deleted file mode 100644 index 75a3caea..00000000 --- a/SearchIDB/My Project/AssemblyInfo.vb +++ /dev/null @@ -1,35 +0,0 @@ -Imports System -Imports System.Reflection -Imports System.Runtime.InteropServices - -' Allgemeine Informationen über eine Assembly werden über die folgenden -' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -' die einer Assembly zugeordnet sind. - -' Werte der Assemblyattribute überprüfen - - - - - - - - - - -'Die folgende GUID wird für die typelib-ID verwendet, wenn dieses Projekt für COM verfügbar gemacht wird. - - -' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -' -' Hauptversion -' Nebenversion -' Buildnummer -' Revision -' -' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, -' indem Sie "*" wie unten gezeigt eingeben: -' - - - diff --git a/SearchIDB/My Project/Resources.Designer.vb b/SearchIDB/My Project/Resources.Designer.vb deleted file mode 100644 index 3d0fa5b0..00000000 --- a/SearchIDB/My Project/Resources.Designer.vb +++ /dev/null @@ -1,62 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -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. - ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. - ''' - _ - 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. - ''' - _ - Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager - Get - If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("SearchIDB.Resources", GetType(Resources).Assembly) - resourceMan = temp - End If - Return resourceMan - End Get - End Property - - ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. - ''' - _ - Friend Property Culture() As Global.System.Globalization.CultureInfo - Get - Return resourceCulture - End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) - resourceCulture = value - End Set - End Property - End Module -End Namespace diff --git a/SearchIDB/My Project/Resources.resx b/SearchIDB/My Project/Resources.resx deleted file mode 100644 index af7dbebb..00000000 --- a/SearchIDB/My Project/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/SearchIDB/My Project/Settings.Designer.vb b/SearchIDB/My Project/Settings.Designer.vb deleted file mode 100644 index c81ccc73..00000000 --- a/SearchIDB/My Project/Settings.Designer.vb +++ /dev/null @@ -1,73 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -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" -#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) - 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 -#End If - Return defaultInstance - End Get - End Property - End Class -End Namespace - -Namespace My - - _ - Friend Module MySettingsProperty - - _ - Friend ReadOnly Property Settings() As Global.SearchIDB.My.MySettings - Get - Return Global.SearchIDB.My.MySettings.Default - End Get - End Property - End Module -End Namespace diff --git a/SearchIDB/My Project/Settings.settings b/SearchIDB/My Project/Settings.settings deleted file mode 100644 index 85b890b3..00000000 --- a/SearchIDB/My Project/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/SearchIDB/My Project/licenses.licx b/SearchIDB/My Project/licenses.licx deleted file mode 100644 index 3f51afe8..00000000 --- a/SearchIDB/My Project/licenses.licx +++ /dev/null @@ -1 +0,0 @@ -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/SearchIDB/OTypeSearch.Designer.vb b/SearchIDB/OTypeSearch.Designer.vb deleted file mode 100644 index 461a5fc8..00000000 --- a/SearchIDB/OTypeSearch.Designer.vb +++ /dev/null @@ -1,80 +0,0 @@ - _ -Partial Class OTypeSearch - Inherits System.Windows.Forms.UserControl - - 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Wird vom Windows Form-Designer benötigt. - Private components As System.ComponentModel.IContainer - - 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. - 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. - 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ - Private Sub InitializeComponent() - Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() - Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'RibbonControl1 - ' - Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem}) - Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 1 - Me.RibbonControl1.Name = "RibbonControl1" - Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl1.Size = New System.Drawing.Size(744, 150) - Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 - ' - 'RibbonPage1 - ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) - Me.RibbonPage1.Name = "RibbonPage1" - Me.RibbonPage1.Text = "RibbonPage1" - ' - 'RibbonPageGroup1 - ' - Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "RibbonPageGroup1" - ' - 'RibbonStatusBar1 - ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 547) - Me.RibbonStatusBar1.Name = "RibbonStatusBar1" - Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(744, 27) - ' - 'OTypeSearch - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.RibbonStatusBar1) - Me.Controls.Add(Me.RibbonControl1) - Me.Name = "OTypeSearch" - Me.Size = New System.Drawing.Size(744, 574) - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - - Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl - Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar -End Class diff --git a/SearchIDB/OTypeSearch.resx b/SearchIDB/OTypeSearch.resx deleted file mode 100644 index 1af7de15..00000000 --- a/SearchIDB/OTypeSearch.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/SearchIDB/OTypeSearch.vb b/SearchIDB/OTypeSearch.vb deleted file mode 100644 index cdc7392b..00000000 --- a/SearchIDB/OTypeSearch.vb +++ /dev/null @@ -1,21 +0,0 @@ -Imports DigitalData.Modules.Database -Imports DigitalData.Modules.Logging -Public Class OTypeSearch - Private _Database As MSSQLServer - Private LogConfig As LogConfig - Private Logger As Logger - Public Username As String - Public User_Language As String - - Public ConnStringIDB As String - Public Sub Init(LogConfig As LogConfig, ConnectionStringIDB As String, Username As String, UserLanguage As String) - Me.LogConfig = LogConfig - Me.Logger = LogConfig.GetLogger() - Me.ConnStringIDB = ConnectionStringIDB - Me.Username = Username - Me.User_Language = UserLanguage - Me._Database = New MSSQLServer(LogConfig, ConnectionStringIDB) - Dim oSQL = "SELECT * FROM " - - End Sub -End Class diff --git a/SearchIDB/SearchIDB.vbproj b/SearchIDB/SearchIDB.vbproj deleted file mode 100644 index 5cf81ecc..00000000 --- a/SearchIDB/SearchIDB.vbproj +++ /dev/null @@ -1,137 +0,0 @@ - - - - - Debug - AnyCPU - {29765A37-4EC5-447F-87CB-8385843FF4C4} - WinExe - SearchIDB.My.MyApplication - SearchIDB - SearchIDB - 512 - WindowsForms - v4.6.1 - true - true - - - AnyCPU - true - full - true - true - bin\Debug\ - SearchIDB.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - AnyCPU - pdbonly - false - true - true - bin\Release\ - SearchIDB.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - Application.myapp - - - True - True - Resources.resx - - - True - Settings.settings - True - - - OTypeSearch.vb - - - UserControl - - - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - OTypeSearch.vb - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - - {eaf0ea75-5fa7-485d-89c7-b2d843b03a96} - Database - - - {903b2d7d-3b80-4be9-8713-7447b704e1b0} - Logging - - - - \ No newline at end of file diff --git a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb index 0552ba1f..d4947fdb 100644 --- a/Services.ZUGFeRDService/My Project/AssemblyInfo.vb +++ b/Services.ZUGFeRDService/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/Services.ZUGFeRDService/ThreadRunner.vb b/Services.ZUGFeRDService/ThreadRunner.vb index d91d3e82..3b8e9d6d 100644 --- a/Services.ZUGFeRDService/ThreadRunner.vb +++ b/Services.ZUGFeRDService/ThreadRunner.vb @@ -118,7 +118,7 @@ Public Class ThreadRunner If Not _workerThread.IsBusy Then _workerThread.RunWorkerAsync(_jobArguments) Else - _logger.Warn("Worker is busy") + _logger.Info("Worker is busy, skipping execution.") End If End Sub