diff --git a/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb b/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb index a7914cc6..e2466217 100644 --- a/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb +++ b/GUIs.ClipboardWatcher/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/GUIs.ClipboardWatcher/ProfileSearches.vb b/GUIs.ClipboardWatcher/ProfileSearches.vb index d26f1c69..9b23e656 100644 --- a/GUIs.ClipboardWatcher/ProfileSearches.vb +++ b/GUIs.ClipboardWatcher/ProfileSearches.vb @@ -117,6 +117,7 @@ Public Class ProfileSearches oSQL = oRow.Item("SQL_COMMAND") oSQL = oPatterns.ReplaceUserValues(oSQL, _Environment.User) oSQL = oPatterns.ReplaceInternalValues(oSQL) + oSQL = oPatterns.ReplaceClipboardContents(oSQL, _Params.ClipboardContents) Dim oConnectionString = GetConnectionString(oConnectionId) Dim oDatatable As DataTable = _Environment.Database.GetDatatableWithConnection(oSQL, oConnectionString) diff --git a/GUIs.ClipboardWatcher/frmMatch.Designer.vb b/GUIs.ClipboardWatcher/frmMatch.Designer.vb index d32465c8..4b816356 100644 --- a/GUIs.ClipboardWatcher/frmMatch.Designer.vb +++ b/GUIs.ClipboardWatcher/frmMatch.Designer.vb @@ -75,12 +75,13 @@ Partial Class frmMatch Me.Label1.ForeColor = System.Drawing.Color.White Me.Label1.Location = New System.Drawing.Point(12, 9) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(368, 21) + Me.Label1.Size = New System.Drawing.Size(408, 21) Me.Label1.TabIndex = 1 - Me.Label1.Text = "Es wurde(n) {0} für Ihre Suche nach '{1}' gefunden:" + Me.Label1.Text = "Es wurde(n) {0} in {1} für Ihre Suche nach '{2}' gefunden:" ' 'Label2 ' + Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.Label2.AutoSize = True Me.Label2.BackColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) Me.Label2.Cursor = System.Windows.Forms.Cursors.Hand @@ -100,8 +101,8 @@ Partial Class frmMatch Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.TileControlMatch) + Me.IconOptions.ShowIcon = False Me.Name = "frmMatch" - Me.ShowIcon = False Me.Text = "Profile gefunden" Me.ResumeLayout(False) Me.PerformLayout() diff --git a/GUIs.ClipboardWatcher/frmMatch.vb b/GUIs.ClipboardWatcher/frmMatch.vb index f9b47583..16ef0fe1 100644 --- a/GUIs.ClipboardWatcher/frmMatch.vb +++ b/GUIs.ClipboardWatcher/frmMatch.vb @@ -56,8 +56,18 @@ Public Class frmMatch _Params = Params End Sub + Private Function GetResultString(CreatedTiles, MatchedProfiles, ClipboardContents) As String + Dim oResultString = IIf(CreatedTiles = 1, "wurde ein Ergebnis", $"wurden {CreatedTiles} Ergebnisse") + Dim oProfileString = IIf(MatchedProfiles = 1, "einem Profil", $"{MatchedProfiles} Profilen") + Dim oBase = "Es {0} in {1} für Ihre Suche nach '{2}' gefunden:" + + Return String.Format(oBase, oResultString, oProfileString, _Params.ClipboardContents) + End Function + Private Async Sub frmMatch_Load(sender As Object, e As EventArgs) Handles MyBase.Load - Dim oCreatedTiles = CreateTiles() + Dim oResult As Tuple(Of Integer, Integer) = CreateTiles() + Dim oCreatedTiles As Integer = oResult.Item1 + Dim oMatchedProfiles As Integer = oResult.Item2 If oCreatedTiles = -1 Then Exit Sub @@ -68,11 +78,11 @@ Public Class frmMatch Close() End If - Dim oMatchString = IIf(oCreatedTiles = 1, "1 Profil", $"{oCreatedTiles} Profile") - Label1.Text = String.Format(Label1.Text, oMatchString, _Params.ClipboardContents) + Label1.Text = GetResultString(oCreatedTiles, oMatchedProfiles, _Params.ClipboardContents) _Logger.Debug($"Created Tiles: {oCreatedTiles} ") - If oCreatedTiles = 1 Then + _Logger.Debug($"Matched Profiles: {oMatchedProfiles}") + If oCreatedTiles = 1 Then Dim oProfile As ProfileData = _Params.MatchingProfiles.First() Dim oProfileSearch As New ProfileSearches(_LogConfig, _Environment, _Params) @@ -97,9 +107,11 @@ Public Class frmMatch TopMost = True End Sub - Function CreateTiles() As Integer + Function CreateTiles() As Tuple(Of Integer, Integer) Try Dim oCreatedTiles As Integer = 0 + Dim oMatchedProfiles As Integer = 0 + Dim oDocumentGroup = TileControlMatch.Groups.Item("TileGroupDocuments") Dim oDataGroup = TileControlMatch.Groups.Item("TileGroupData") Dim oDataDocumentsGroup = TileControlMatch.Groups.Item("TileGroupDocumentsData") @@ -118,12 +130,15 @@ Public Class frmMatch ' End If 'End If + Dim oProfileMatch As Boolean = False + If oProfile.ProfileType = ProfileType.ANY Or oProfile.ProfileType = ProfileType.DOCS_ONLY Then _Logger.Debug("Docs only or ProfileTypeAny") If oProfile.CountDocs > 0 Then Dim oItem = CreateTile(oProfile, $"{oProfile.CountDocs} Dateien") oDocumentGroup.Items.Add(oItem) oCreatedTiles += 1 + oProfileMatch = True Else _Logger.Debug("NO Doc-Results!") End If @@ -134,17 +149,22 @@ Public Class frmMatch Dim oItem = CreateTile(oProfile, $"{oProfile.CountData} Datensätze") oDataGroup.Items.Add(oItem) oCreatedTiles += 1 + oProfileMatch = True Else _Logger.Debug("NO Data-Results!") End If End If + + If oProfileMatch Then + oMatchedProfiles += 1 + End If Next - Return oCreatedTiles + Return New Tuple(Of Integer, Integer)(oCreatedTiles, oMatchedProfiles) Catch ex As Exception _Logger.Error(ex) MsgBox("Error while creating profile tiles!" & vbNewLine & ex.Message) - Return -1 + Return New Tuple(Of Integer, Integer)(-1, -1) End Try End Function @@ -200,7 +220,9 @@ Public Class frmMatch Private Sub Label2_Click(sender As Object, e As EventArgs) Handles Label2.Click Dim oForm As New frmTreeView(_Params.MatchTreeView.Nodes) With { - .StartPosition = FormStartPosition.CenterScreen + .StartPosition = FormStartPosition.Manual, + .Left = Left + Width, + .Top = Top } oForm.ShowDialog() End Sub diff --git a/GUIs.Test.ZUGFeRDTest/Form1.vb b/GUIs.Test.ZUGFeRDTest/Form1.vb index 13f00e5e..94fbd144 100644 --- a/GUIs.Test.ZUGFeRDTest/Form1.vb +++ b/GUIs.Test.ZUGFeRDTest/Form1.vb @@ -25,7 +25,7 @@ Public Class Form1 _firebird = New Firebird(_logConfig, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PASS) _mssql = New MSSQLServer(_logConfig, My.Settings.MSSQL_CONNECTIONSTRING) - _zugferd = New ZUGFeRDInterface(_logConfig, "") + _zugferd = New ZUGFeRDInterface(_logConfig, "21182889975216572111813147150675976632") End Sub Private Function LoadFolderConfig(args As WorkerArgs) @@ -105,7 +105,7 @@ Public Class Form1 Dim oResult = OpenFileDialog1.ShowDialog() If oResult = DialogResult.OK Then - Dim oDoc = _zugferd.ValidateZUGFeRDFile(OpenFileDialog1.FileName) + Dim oDoc = _zugferd.ValidateZUGFeRDFileWithGDPicture(OpenFileDialog1.FileName) Dim oZUGFERD = _zugferd.SerializeZUGFeRDDocument(oDoc) Console.WriteLine() End If diff --git a/SQLEditor/My Project/Application.Designer.vb b/SQLEditor/My Project/Application.Designer.vb new file mode 100644 index 00000000..8ab460ba --- /dev/null +++ b/SQLEditor/My Project/Application.Designer.vb @@ -0,0 +1,13 @@ +'------------------------------------------------------------------------------ +' +' 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 + diff --git a/SQLEditor/My Project/Application.myapp b/SQLEditor/My Project/Application.myapp new file mode 100644 index 00000000..758895de --- /dev/null +++ b/SQLEditor/My Project/Application.myapp @@ -0,0 +1,10 @@ + + + false + false + 0 + true + 0 + 1 + true + diff --git a/SQLEditor/My Project/AssemblyInfo.vb b/SQLEditor/My Project/AssemblyInfo.vb new file mode 100644 index 00000000..be959c96 --- /dev/null +++ b/SQLEditor/My Project/AssemblyInfo.vb @@ -0,0 +1,34 @@ +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/SQLEditor/My Project/Resources.Designer.vb b/SQLEditor/My Project/Resources.Designer.vb new file mode 100644 index 00000000..1f1b8f74 --- /dev/null +++ b/SQLEditor/My Project/Resources.Designer.vb @@ -0,0 +1,63 @@ +'------------------------------------------------------------------------------ +' +' 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("DigitalData.Controls.SQLEditor.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/SQLEditor/My Project/Resources.resx b/SQLEditor/My Project/Resources.resx new file mode 100644 index 00000000..af7dbebb --- /dev/null +++ b/SQLEditor/My Project/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/SQLEditor/My Project/Settings.Designer.vb b/SQLEditor/My Project/Settings.Designer.vb new file mode 100644 index 00000000..f47e6223 --- /dev/null +++ b/SQLEditor/My Project/Settings.Designer.vb @@ -0,0 +1,73 @@ +'------------------------------------------------------------------------------ +' +' 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.DigitalData.Controls.SQLEditor.My.MySettings + Get + Return Global.DigitalData.Controls.SQLEditor.My.MySettings.Default + End Get + End Property + End Module +End Namespace diff --git a/SQLEditor/My Project/Settings.settings b/SQLEditor/My Project/Settings.settings new file mode 100644 index 00000000..85b890b3 --- /dev/null +++ b/SQLEditor/My Project/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/SQLEditor/SQLEditor.vb b/SQLEditor/SQLEditor.vb new file mode 100644 index 00000000..03d39e73 --- /dev/null +++ b/SQLEditor/SQLEditor.vb @@ -0,0 +1,3 @@ +Public Class SQLEditor + +End Class diff --git a/SQLEditor/SQLEditor.vbproj b/SQLEditor/SQLEditor.vbproj new file mode 100644 index 00000000..11c59862 --- /dev/null +++ b/SQLEditor/SQLEditor.vbproj @@ -0,0 +1,119 @@ + + + + + Debug + AnyCPU + {E707BF50-6799-42B2-869F-E10641D51219} + Library + DigitalData.Controls.SQLEditor + DigitalData.Controls.SQLEditor + 512 + Windows + v4.7.2 + true + + + true + full + true + true + bin\Debug\ + DigitalData.Controls.SQLEditor.xml + _MYFORMS=True + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + pdbonly + false + true + true + bin\Release\ + DigitalData.Controls.SQLEditor.xml + _MYFORMS=True + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + On + + + Binary + + + Off + + + On + + + + + + + + + + + + + + + + + + + + + + + + + + + + frmSQLEditor.vb + + + Form + + + True + Application.myapp + + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + SettingsSingleFileGenerator + My + Settings.Designer.vb + + + + + + + \ No newline at end of file diff --git a/SQLEditor/frmSQLEditor.Designer.vb b/SQLEditor/frmSQLEditor.Designer.vb new file mode 100644 index 00000000..8fa5948f --- /dev/null +++ b/SQLEditor/frmSQLEditor.Designer.vb @@ -0,0 +1,30 @@ + _ +Partial Class frmSQLEditor + 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() + components = New System.ComponentModel.Container + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Text = "frmSQLEditor" + End Sub +End Class diff --git a/SQLEditor/frmSQLEditor.vb b/SQLEditor/frmSQLEditor.vb new file mode 100644 index 00000000..8bec02d1 --- /dev/null +++ b/SQLEditor/frmSQLEditor.vb @@ -0,0 +1,3 @@ +Public Class frmSQLEditor + +End Class \ No newline at end of file