diff --git a/GUIs.Common/Base/BaseErrorHandler.vb b/GUIs.Common/Base/BaseErrorHandler.vb index 9773027d..85034d9f 100644 --- a/GUIs.Common/Base/BaseErrorHandler.vb +++ b/GUIs.Common/Base/BaseErrorHandler.vb @@ -8,9 +8,6 @@ Namespace Base Private _Logger As Logger Private _Form As Form - Private Const UNKNOWN_METHOD = "Unknown Method" - Private Const UNKNOWN_FORM = "Unknown Form" - Public Sub New(LogConfig As LogConfig, Logger As Logger, Form As Form) _LogConfig = LogConfig _Logger = Logger @@ -28,9 +25,7 @@ Namespace Base End Sub Private Function GetMessage(Exception As Exception) As String - Dim oTargetSite = Exception.TargetSite - Dim oMethodName = GetMethodName(Exception) - Dim oFormName = GetFormName(Exception) + Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2) Dim oMessage As String = String.Empty If TypeOf Exception Is SqlClient.SqlException Then @@ -42,7 +37,7 @@ Namespace Base ElseIf TypeOf Exception Is NoNullAllowedException Then oMessage = "Einige benötigte Felder wurde nicht ausgefüllt." Else - oMessage = $"Es ist ein unerwarteter Fehler in {oFormName}/{oMethodName} aufgetreten. Mehr Informationen finden Sie im Log." + oMessage = $"Es ist ein unerwarteter Fehler in {oCallingClass} aufgetreten. Mehr Informationen finden Sie im Log." End If If _LogConfig.Debug Then @@ -55,49 +50,6 @@ Namespace Base Return oMessage End Function - - 'Private Function GetMessage(Exception As Exception) As String - ' Dim oTargetSite = Exception.TargetSite - ' Dim oMethodName = GetMethodName(Exception) - ' Dim oFormName = GetFormName(Exception) - ' Dim oMessage As String = String.Empty - - ' oMessage &= $"Form: {oFormName}{vbNewLine}" - ' oMessage &= $"Method: {oMethodName}{vbNewLine}" - - ' If Not String.IsNullOrEmpty(Exception.StackTrace) Then - ' oMessage &= $"Message: {Exception.Message}{vbNewLine}{vbNewLine}" - ' End If - - ' If Not String.IsNullOrEmpty(Exception.StackTrace) Then - ' oMessage &= $"Stacktrace: {Exception.StackTrace}{vbNewLine}" - ' End If - - ' oMessage &= $"{vbNewLine}" - ' oMessage &= $"Please report this error to error@digitaldata.works" - - ' Return oMessage - 'End Function - - Private Function GetMethodName(Exception As Exception) As String - Dim oMethodName = Exception.TargetSite?.Name - - If oMethodName Is Nothing Then - Return UNKNOWN_METHOD - Else - Return oMethodName - End If - End Function - - Private Function GetFormName(Exception As Exception) As String - Dim oFormName = Exception.TargetSite?.ReflectedType?.Name - - If oFormName Is Nothing Then - Return UNKNOWN_FORM - Else - Return oFormName - End If - End Function End Class End Namespace diff --git a/GUIs.Common/Common.vbproj.bak b/GUIs.Common/Common.vbproj.bak deleted file mode 100644 index 277c7740..00000000 --- a/GUIs.Common/Common.vbproj.bak +++ /dev/null @@ -1,227 +0,0 @@ - - - - - Debug - AnyCPU - {D20A6BF2-C7C6-4A7A-B34D-FA27D775A049} - Library - DigitalData.GUIs.Common - DigitalData.GUIs.Common - 512 - Windows - v4.6.1 - - - true - full - true - true - bin\Debug\ - DigitalData.GUIs.Common.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - pdbonly - false - true - true - bin\Release\ - DigitalData.GUIs.Common.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - - - - - - - - - - - - - - - ..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll - - - D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll - - - - ..\packages\NLog.4.6.8\lib\net45\NLog.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - - - - frmDataResultList.vb - - - Form - - - - - frmDocumentResultList.vb - - - Form - - - - - True - Application.myapp - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - frmDataResultList.vb - - - frmDocumentResultList.vb - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - {44982f9b-6116-44e2-85d0-f39650b1ef99} - Config - - - {EAF0EA75-5FA7-485D-89C7-B2D843B03A96} - Database - - - {d3c8cfed-d6f6-43a8-9bdf-454145d0352f} - Language - - - {903B2D7D-3B80-4BE9-8713-7447B704E1B0} - Logging - - - {81cac44f-3711-4c8f-ae98-e02a7448782a} - ZooFlow - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/GUIs.Common/GridBuilder.vb b/GUIs.Common/GridBuilder.vb index 87da002f..e3702752 100644 --- a/GUIs.Common/GridBuilder.vb +++ b/GUIs.Common/GridBuilder.vb @@ -12,21 +12,45 @@ Public Class GridBuilder Views.AddRange(GridViews) End Sub + ''' + ''' Applies common properties to all GridViews + ''' Public Function WithDefaults() As GridBuilder For Each oView In Views - oView.OptionsView.EnableAppearanceEvenRow = True - oView.OptionsView.ShowAutoFilterRow = True + WithDefaults(oView) Next Return Me End Function + ''' + ''' Applies common properties to the supplied GridView + ''' + Public Function WithDefaults(GridView As GridView) + GridView.OptionsView.EnableAppearanceEvenRow = True + GridView.OptionsView.ShowAutoFilterRow = True + + Return Me + End Function + + ''' + ''' Applies read-only properties to all GridViews + ''' Public Function WithReadOnlyOptions() As GridBuilder For Each oView In Views - oView.OptionsBehavior.Editable = False - oView.OptionsBehavior.ReadOnly = True + WithReadOnlyOptions(oView) Next Return Me End Function + + ''' + ''' Applies read-only properties to the supplied GridView + ''' + Public Function WithReadOnlyOptions(GridView As GridView) As GridBuilder + GridView.OptionsBehavior.Editable = False + GridView.OptionsBehavior.ReadOnly = True + + Return Me + End Function End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Interface.vb b/GUIs.ZooFlow/Administration/IAdminForm.vb similarity index 71% rename from GUIs.ZooFlow/Administration/frmAdmin_Interface.vb rename to GUIs.ZooFlow/Administration/IAdminForm.vb index 354f8c30..5c6e32a3 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Interface.vb +++ b/GUIs.ZooFlow/Administration/IAdminForm.vb @@ -1,6 +1,4 @@ -Imports DigitalData.Modules.Logging - -Public Interface frmAdmin_Interface +Public Interface IAdminForm Property PrimaryKey As Integer Property HasChanges As Boolean Property IsInsert As Boolean diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Base.vb b/GUIs.ZooFlow/Administration/frmAdmin_Base.vb deleted file mode 100644 index 73c8bcd1..00000000 --- a/GUIs.ZooFlow/Administration/frmAdmin_Base.vb +++ /dev/null @@ -1,30 +0,0 @@ -Imports DevExpress.XtraBars.Ribbon -Imports DigitalData.Modules.Logging - -Partial Public MustInherit Class BaseForm - Inherits RibbonForm - - Friend Logger As Logger - - Public Sub New() - Logger = My.LogConfig?.GetLogger - End Sub - - Public Sub ShowInfo(Message As String) - MessageBox.Show(Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Information) - End Sub - - Public Sub ShowError(Message As String) - MessageBox.Show(Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Exclamation) - End Sub - - Public Sub ShowError(Exception As Exception) - Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, 2) - Logger.Error(Exception) - ShowError($"Error in {oCallingClass}:{vbNewLine}{Exception.Message}") - End Sub -End Class - -Partial Public Class frmAdmin_Base - Inherits BaseForm -End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.Designer.vb deleted file mode 100644 index e1c28608..00000000 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.Designer.vb +++ /dev/null @@ -1,114 +0,0 @@ - _ -Partial Class frmAdmin_CWDataSearch - Inherits frmAdmin_Base - - '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.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() - Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() - Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'RibbonControl1 - ' - Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified - Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2}) - Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 3 - Me.RibbonControl1.Name = "RibbonControl1" - Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide - Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(800, 66) - Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 - Me.RibbonControl1.Toolbar.ShowCustomizeItem = False - ' - 'BarButtonItem1 - ' - Me.BarButtonItem1.Caption = "Speichern und Schließen" - Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_check3 - Me.BarButtonItem1.Name = "BarButtonItem1" - ' - 'BarButtonItem2 - ' - Me.BarButtonItem2.Caption = "Speichern" - Me.BarButtonItem2.Id = 2 - Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.save6 - Me.BarButtonItem2.Name = "BarButtonItem2" - ' - 'RibbonPage1 - ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) - Me.RibbonPage1.Name = "RibbonPage1" - Me.RibbonPage1.Text = "RibbonPage1" - ' - 'RibbonPageGroup1 - ' - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) - Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "RibbonPageGroup1" - ' - 'RibbonStatusBar1 - ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 428) - Me.RibbonStatusBar1.Name = "RibbonStatusBar1" - Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 22) - ' - 'RibbonPage2 - ' - Me.RibbonPage2.Name = "RibbonPage2" - Me.RibbonPage2.Text = "RibbonPage2" - ' - 'frmAdmin_CWDataSearch - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(800, 450) - Me.Controls.Add(Me.RibbonStatusBar1) - Me.Controls.Add(Me.RibbonControl1) - Me.Name = "frmAdmin_CWDataSearch" - Me.Ribbon = Me.RibbonControl1 - Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "Clipboard Watcher - Datensuche" - 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 - Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem -End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.resx b/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.resx deleted file mode 100644 index 1af7de15..00000000 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.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/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb deleted file mode 100644 index b2b02471..00000000 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWDataSearch.vb +++ /dev/null @@ -1,15 +0,0 @@ -Public Class frmAdmin_CWDataSearch - Implements frmAdmin_Interface - - Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey - Public Property HasChanges As Boolean Implements frmAdmin_Interface.HasChanges - Public Property IsInsert As Boolean Implements frmAdmin_Interface.IsInsert - - Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData - Throw New NotImplementedException() - End Function - - Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData - Throw New NotImplementedException() - End Function -End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb index 2ba738e9..bf811918 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb @@ -1,6 +1,8 @@ - +Imports DigitalData.GUIs.Common.Base + + Partial Class frmAdmin_CWProfile - Inherits frmAdmin_Base + Inherits BaseRibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb index 1cb87d3d..edb9cdc1 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb @@ -9,11 +9,11 @@ Imports DigitalData.GUIs.Common Imports DigitalData.Modules.Logging Public Class frmAdmin_CWProfile - Implements frmAdmin_Interface + Implements IAdminForm - Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey - Public Property HasChanges As Boolean Implements frmAdmin_Interface.HasChanges - Public Property IsInsert As Boolean Implements frmAdmin_Interface.IsInsert + Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey + Public Property HasChanges As Boolean Implements IAdminForm.HasChanges + Public Property IsInsert As Boolean Implements IAdminForm.IsInsert Private Const BUTTON_REGEX_PROFILE = "BUTTON_REGEX_PROFILE" Private Const BUTTON_SEARCH_SQL = "BUTTON_SEARCH_SQL" @@ -26,11 +26,12 @@ Public Class frmAdmin_CWProfile Private Pages As ClassDetailPages Public Sub New(PrimaryKey As Integer) + MyBase.New(My.LogConfig) + ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - Logger = My.LogConfig.GetLogger() Me.PrimaryKey = PrimaryKey Me.IsInsert = IsInsert End Sub @@ -86,7 +87,7 @@ Public Class frmAdmin_CWProfile AddHandler Pages.AnyControl_Focus, AddressOf AnyControl_Focus AddHandler Pages.AnyControl_Changed, AddressOf AnyControl_Changed Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) End Try End Sub @@ -117,7 +118,7 @@ Public Class frmAdmin_CWProfile - Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData + Public Function SaveData() As Boolean Implements IAdminForm.SaveData If Pages.CurrentPage Is Nothing Then Return False End If @@ -144,7 +145,7 @@ Public Class frmAdmin_CWProfile Return False Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) Return False End Try End Function @@ -165,7 +166,7 @@ Public Class frmAdmin_CWProfile End If End Sub - Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData Throw New NotImplementedException() End Function @@ -199,7 +200,7 @@ Public Class frmAdmin_CWProfile Dim oTextEdit As TextEdit = sender If e.Button.Tag = BUTTON_SEARCH_SQL Then - Dim oForm As New frmSQLEditor(oTextEdit.EditValue) + Dim oForm As New frmSQLEditor(My.LogConfig, My.Database) With {.SQLString = oTextEdit.EditValue} Dim oResult = oForm.ShowDialog() If oResult = DialogResult.OK Then @@ -212,7 +213,7 @@ Public Class frmAdmin_CWProfile Dim oTextEdit As TextEdit = sender If e.Button.Tag = BUTTON_COUNT_SQL Then - Dim oForm As New frmSQLEditor(oTextEdit.EditValue) + Dim oForm As New frmSQLEditor(My.LogConfig, My.Database) With {.SQLString = oTextEdit.EditValue} Dim oResult = oForm.ShowDialog() If oResult = DialogResult.OK Then diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb index dd2eeeda..a80915ee 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb @@ -1,6 +1,8 @@ - +Imports DigitalData.GUIs.Common.Base + + Partial Class frmAdmin_Globix - Inherits frmAdmin_Base + Inherits BaseRibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb index a88839d0..ceb3bdb2 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb @@ -1,18 +1,18 @@ Imports DigitalData.Modules.Logging Public Class frmAdmin_Globix - Inherits frmAdmin_Base - Implements frmAdmin_Interface - Public Property HasChanges As Boolean = False Implements frmAdmin_Interface.HasChanges - Public Property IsInsert As Boolean = False Implements frmAdmin_Interface.IsInsert - Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey + Implements IAdminForm + Public Property HasChanges As Boolean = False Implements IAdminForm.HasChanges + Public Property IsInsert As Boolean = False Implements IAdminForm.IsInsert + Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey Public Sub New(PrimaryKey As Integer, Optional IsInsert As Boolean = False) + MyBase.New(My.LogConfig) + ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - Logger = My.LogConfig.GetLogger() Me.PrimaryKey = PrimaryKey Me.IsInsert = IsInsert End Sub @@ -22,7 +22,7 @@ Public Class frmAdmin_Globix TBDD_DOKUMENTARTTableAdapter.Connection.ConnectionString = My.Database.CurrentSQLConnectionString Me.TBDD_DOKUMENTARTTableAdapter.Fill(Me.GlobixDataset.TBDD_DOKUMENTART, PrimaryKey) Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) End Try End Sub @@ -51,7 +51,7 @@ Public Class frmAdmin_Globix End If End Sub - Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData + Public Function SaveData() As Boolean Implements IAdminForm.SaveData Try TBDD_DOKUMENTARTBindingSource.EndEdit() @@ -70,7 +70,7 @@ Public Class frmAdmin_Globix Return True Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) Return False End Try End Function @@ -79,7 +79,7 @@ Public Class frmAdmin_Globix End Sub - Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData Throw New NotImplementedException() End Function End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb index 28340374..39e5753e 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb @@ -1,6 +1,8 @@ - +Imports DigitalData.GUIs.Common.Base + + Partial Class frmAdmin_IDBAttribute - Inherits frmAdmin_Base + Inherits BaseRibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb index d990110b..c9bb2bb9 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb @@ -1,12 +1,9 @@ -Imports DigitalData.Modules.Logging +Public Class frmAdmin_IDBAttribute + Implements IAdminForm -Public Class frmAdmin_IDBAttribute - Inherits frmAdmin_Base - Implements frmAdmin_Interface - - Public Property HasChanges As Boolean = False Implements frmAdmin_Interface.HasChanges - Public Property IsInsert As Boolean = False Implements frmAdmin_Interface.IsInsert - Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey + Public Property HasChanges As Boolean = False Implements IAdminForm.HasChanges + Public Property IsInsert As Boolean = False Implements IAdminForm.IsInsert + Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey Public Sub New(PrimaryKey As Integer, Optional IsInsert As Boolean = False) ' Dieser Aufruf ist für den Designer erforderlich. @@ -22,7 +19,7 @@ Public Class frmAdmin_IDBAttribute TBIDB_ATTRIBUTE_TYPETableAdapter.Fill(DSIDB_Stammdaten.TBIDB_ATTRIBUTE_TYPE) VWIDB_BE_ATTRIBUTETableAdapter.FillByAttributeId(DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE, PrimaryKey, 1) Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) End Try End Sub @@ -51,7 +48,7 @@ Public Class frmAdmin_IDBAttribute End If End Sub - Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData + Public Function SaveData() As Boolean Implements IAdminForm.SaveData Try VWIDB_BE_ATTRIBUTEBindingSource.EndEdit() @@ -72,7 +69,7 @@ Public Class frmAdmin_IDBAttribute Return True Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) Return False End Try End Function @@ -87,12 +84,12 @@ Public Class frmAdmin_IDBAttribute WHERE (GUID = @GUID)" End Sub - Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData Try TBIDB_ATTRIBUTE_TYPETableAdapter.Delete(PrimaryKey) Return True Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) Return False End Try End Function diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb index d810a618..5f706cb9 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb @@ -1,6 +1,8 @@ - _ +Imports DigitalData.GUIs.Common.Base + + Partial Class frmAdmin_IDBEntity - Inherits frmAdmin_Base + Inherits BaseRibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. _ diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb index 54a57ea0..037dae24 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb @@ -1,18 +1,18 @@ Imports DigitalData.Modules.Logging Public Class frmAdmin_IDBEntity - Inherits frmAdmin_Base - Implements frmAdmin_Interface - Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey - Public Property HasChanges As Boolean Implements frmAdmin_Interface.HasChanges - Public Property IsInsert As Boolean Implements frmAdmin_Interface.IsInsert + Implements IAdminForm + Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey + Public Property HasChanges As Boolean Implements IAdminForm.HasChanges + Public Property IsInsert As Boolean Implements IAdminForm.IsInsert Public Sub New(PrimaryKey As Integer, Optional IsInsert As Boolean = False) + MyBase.New(My.LogConfig) + ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - Logger = My.LogConfig.GetLogger() Me.PrimaryKey = PrimaryKey Me.IsInsert = IsInsert End Sub @@ -21,7 +21,7 @@ Public Class frmAdmin_IDBEntity Try TBIDB_BUSINESS_ENTITYTableAdapter.Fill(DSIDB_Stammdaten.TBIDB_BUSINESS_ENTITY, PrimaryKey) Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) End Try End Sub @@ -49,7 +49,7 @@ Public Class frmAdmin_IDBEntity End If End Sub - Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData + Public Function SaveData() As Boolean Implements IAdminForm.SaveData Try TBIDB_BUSINESS_ENTITYBindingSource.EndEdit() @@ -68,17 +68,17 @@ Public Class frmAdmin_IDBEntity Return True Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) Return False End Try End Function - Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData Try TBIDB_BUSINESS_ENTITYTableAdapter.Delete(PrimaryKey) Return True Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) Return False End Try End Function diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb index ed0379ef..a1a2fc98 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb @@ -1,6 +1,8 @@ - +Imports DigitalData.GUIs.Common.Base + + Partial Class frmAdmin_SourceSQL - Inherits frmAdmin_Base + Inherits BaseRibbonForm 'Form overrides dispose to clean up the component list. diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb index 5c22c9b5..6769f1d6 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb @@ -2,13 +2,13 @@ Imports DevExpress.XtraLayout Public Class frmAdmin_SourceSQL - Implements frmAdmin_Interface + Implements IAdminForm - Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey + Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey - Public Property HasChanges As Boolean Implements frmAdmin_Interface.HasChanges + Public Property HasChanges As Boolean Implements IAdminForm.HasChanges - Public Property IsInsert As Boolean Implements frmAdmin_Interface.IsInsert + Public Property IsInsert As Boolean Implements IAdminForm.IsInsert Public Sub New(PrimaryKey As Integer) ' Dieser Aufruf ist für den Designer erforderlich. @@ -28,7 +28,7 @@ Public Class frmAdmin_SourceSQL ValidationHelper() Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) End Try End Sub @@ -69,7 +69,7 @@ Public Class frmAdmin_SourceSQL Return oControlList End Function - Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData + Public Function SaveData() As Boolean Implements IAdminForm.SaveData Try @@ -90,17 +90,17 @@ Public Class frmAdmin_SourceSQL Return True Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) Return False End Try End Function - Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData Try TBZF_ADMIN_SOURCE_SQLTableAdapter.Delete(PrimaryKey) Return True Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) Return False End Try End Function diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index ace7b361..270c0430 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -1,9 +1,10 @@ Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid.Views.Grid +Imports DigitalData.GUIs.Common.Base Partial Class frmAdmin_Start - Inherits frmAdmin_Base + Inherits BaseRibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index f3ffb605..20bfba87 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -9,8 +9,6 @@ Imports DigitalData.GUIs.ZooFlow.Administration.ClassConstants Imports DevExpress.XtraGrid Public Class frmAdmin_Start - Inherits frmAdmin_Base - Private CurrentModule As String Private CurrentPage As String Private CurrentItem As ClassDetailForm.DetailData @@ -25,7 +23,7 @@ Public Class frmAdmin_Start TreeListMenu.ExpandAll() End Sub - Private Sub DetailForm_Closed(sender As Object, e As frmAdmin_Interface) + Private Sub DetailForm_Closed(sender As Object, e As IAdminForm) If e.HasChanges Then Load_SQLData() Load_GridData(DetailForm.DetailDataList.Item(CurrentPage)) @@ -103,7 +101,7 @@ Public Class frmAdmin_Start CurrentPage = e.Node.Tag.ToString End If Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) End Try End Sub @@ -206,7 +204,7 @@ Public Class frmAdmin_Start End If End If Catch ex As Exception - ShowError(ex) + ShowErrorMessage(ex) End Try End Sub diff --git a/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb b/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb index 7c8bc544..e1970824 100644 --- a/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb +++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb @@ -2,10 +2,10 @@ Imports DigitalData.Modules.Logging Public Class frmGlobixAdministration - Implements frmAdmin_Interface - Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey - Public Property HasChanges As Boolean Implements frmAdmin_Interface.HasChanges - Public Property IsInsert As Boolean Implements frmAdmin_Interface.IsInsert + Implements IAdminForm + Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey + Public Property HasChanges As Boolean Implements IAdminForm.HasChanges + Public Property IsInsert As Boolean Implements IAdminForm.IsInsert Private Logger As Logger Private CURRCOntrolGroup As LayoutControlGroup Public Sub New(PrimaryKey As Integer) @@ -105,7 +105,7 @@ Public Class frmGlobixAdministration End Sub - Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData + Public Function SaveData() As Boolean Implements IAdminForm.SaveData Throw New NotImplementedException() End Function @@ -205,7 +205,7 @@ Public Class frmGlobixAdministration End Select End Sub - Public Function DeleteData() As Boolean Implements frmAdmin_Interface.DeleteData + Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData Throw New NotImplementedException() End Function End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index f639044d..d5a38f4e 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -115,15 +115,6 @@ - - Form - - - frmAdmin_CWDataSearch.vb - - - Form - frmAdmin_CWProfile.vb @@ -142,7 +133,7 @@ Form - + frmAdmin_Globix.vb @@ -315,9 +306,6 @@ - - frmAdmin_CWDataSearch.vb - frmAdmin_CWProfile.vb