diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index 8f7e6116..6dbe6085 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -60,6 +60,7 @@ Partial Class frmAdmin_Start Me.btnEditRecord = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem26 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem27 = New DevExpress.XtraBars.BarButtonItem() + Me.btnDatabaseConnection = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -134,9 +135,9 @@ Partial Class frmAdmin_Start 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.labelStatus, Me.labelError, Me.BarButtonItemAddAttribute, Me.BarButtonItemRefreshAttribute, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.BarButtonItem20, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.btnAddRecord, Me.btnEditRecord, Me.BarButtonItem26, Me.BarButtonItem27}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.labelStatus, Me.labelError, Me.BarButtonItemAddAttribute, Me.BarButtonItemRefreshAttribute, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.BarButtonItem20, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.btnAddRecord, Me.btnEditRecord, Me.BarButtonItem26, Me.BarButtonItem27, Me.btnDatabaseConnection}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 37 + Me.RibbonControl1.MaxItemId = 38 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -372,6 +373,13 @@ Partial Class frmAdmin_Start Me.BarButtonItem27.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.text1 Me.BarButtonItem27.Name = "BarButtonItem27" ' + 'btnDatabaseConnection + ' + Me.btnDatabaseConnection.Caption = "Datenbank konfigurieren" + Me.btnDatabaseConnection.Id = 37 + Me.btnDatabaseConnection.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.managedatasource3 + Me.btnDatabaseConnection.Name = "btnDatabaseConnection" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1}) @@ -383,6 +391,7 @@ Partial Class frmAdmin_Start Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem27) Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem9) + Me.RibbonPageGroup2.ItemLinks.Add(Me.btnDatabaseConnection) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Daten" ' @@ -941,4 +950,5 @@ Partial Class frmAdmin_Start Friend WithEvents RibbonPage_ClipboardWatcher As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents BarButtonItem26 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem27 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents btnDatabaseConnection As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index 75f1592e..dad8903a 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -9,6 +9,7 @@ Imports DigitalData.GUIs.ZooFlow.Administration.ClassConstants Imports DevExpress.XtraGrid Imports DevExpress.XtraBars Imports DigitalData.Modules.Language +Imports DigitalData.Controls.SQLConfig Public Class frmAdmin_Start Private CurrentModule As String @@ -29,6 +30,13 @@ Public Class frmAdmin_Start DetailForm = New ClassDetailForm(My.LogConfig) AddHandler DetailForm.DetailFormClosed, AddressOf DetailForm_Closed + If My.SystemConfig.ConnectionString = String.Empty Then + If ShowDatabaseSettings() = False Then + MsgBox("Die Datenbank verbindung wurde nicht konfiguriert. Die Administration kann nicht verwendet werden.", MsgBoxStyle.Critical, Text) + Exit Sub + End If + End If + DetailForm.LoadData() TreeListMenu.ExpandAll() End Sub @@ -283,7 +291,24 @@ Public Class frmAdmin_Start oForm.ShowDialog() End Sub - Private Sub RibbonControl1_Click(sender As Object, e As EventArgs) Handles RibbonControl1.Click - + Private Sub btnDatabaseConnection_ItemClick(sender As Object, e As ItemClickEventArgs) Handles btnDatabaseConnection.ItemClick + ShowDatabaseSettings() End Sub + + Private Function ShowDatabaseSettings() As Boolean + Dim oForm As New frmSQLConfig(My.LogConfig) With { + .ConnectionString = My.SystemConfig.ConnectionString, + .FormTitle = "ECM Datenbank" + } + Dim oResult = oForm.ShowDialog() + + If oResult = DialogResult.OK Then + My.SystemConfig.ConnectionString = oForm.ConnectionString + My.SystemConfigManager.Save() + + Return True + Else + Return False + End If + End Function End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index 5b039398..44b32bf6 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -37,7 +37,7 @@ Public Class ClassInit ' === Init Schritte definieren _Loader.AddStep("Initializing Base", AddressOf InitializeBase, True) - _Loader.AddStep("Initializing Database (1/2)", AddressOf InitializeDatabase, True) + '_Loader.AddStep("Initializing Database (1/2)", AddressOf InitializeDatabase, True) _Loader.AddStep("Initializing EDMI Service", AddressOf InitializeService, True) _Loader.AddStep("Initializing Database (2/2)", AddressOf InitializeDatabaseWithFallback, True) _Loader.AddStep("Initializing User", AddressOf InitializeUser, True) @@ -59,55 +59,55 @@ Public Class ClassInit End Sub Private Sub InitializeDatabase(MyApplication As My.MyApplication) - Dim oConnectionString = MSSQLServer.DecryptConnectionString(My.SystemConfig.ConnectionString) - My.DatabaseECM = New MSSQLServer(My.LogConfig, oConnectionString) + 'Dim oConnectionString = MSSQLServer.DecryptConnectionString(My.SystemConfig.ConnectionString) + 'My.DatabaseECM = New MSSQLServer(My.LogConfig, oConnectionString) - If My.DatabaseECM.DBInitialized = False Then - Logger.Warn("Could not initialize DD_ECM-Database!") - Throw New InitException("Could not initialize ECM-Database!") + 'If My.DatabaseECM.DBInitialized = False Then + ' Logger.Warn("Could not initialize DD_ECM-Database!") + ' Throw New InitException("Could not initialize ECM-Database!") - Else - Dim oSQl = "SELECT * FROM TBDD_CONNECTION WHERE BEZEICHNUNG = 'IDB' AND AKTIV = 1" - Dim oDatatable As DataTable = My.DatabaseECM.GetDatatable(oSQl) + 'Else + ' Dim oSQl = "SELECT * FROM TBDD_CONNECTION WHERE BEZEICHNUNG = 'IDB' AND AKTIV = 1" + ' Dim oDatatable As DataTable = My.DatabaseECM.GetDatatable(oSQl) - If IsNothing(oDatatable) OrElse oDatatable.Rows.Count = 0 Then + ' If IsNothing(oDatatable) OrElse oDatatable.Rows.Count = 0 Then - Dim oForm As New frmSQLConfig(My.LogConfig) With {.FormTitle = "IDB Datenbank"} - Dim oResult = oForm.ShowDialog() + ' Dim oForm As New frmSQLConfig(My.LogConfig) With {.FormTitle = "IDB Datenbank"} + ' Dim oResult = oForm.ShowDialog() - If oResult = DialogResult.OK Then - Dim oConnectionStringSaved = SaveConnectionString(oForm.ConnectionString) + ' If oResult = DialogResult.OK Then + ' Dim oConnectionStringSaved = SaveConnectionString(oForm.ConnectionString) - If oConnectionStringSaved = False Then - Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!") - End If + ' If oConnectionStringSaved = False Then + ' Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!") + ' End If - oDatatable = My.Database.GetDatatableECM(oSQl) - End If + ' oDatatable = My.Database.GetDatatableECM(oSQl) + ' End If - End If + ' End If - If oDatatable.Rows.Count > 1 Then - Logger.Warn("Multiple IDB connection entries in TBDD_CONNECTION found!") - Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!") - End If + ' If oDatatable.Rows.Count > 1 Then + ' Logger.Warn("Multiple IDB connection entries in TBDD_CONNECTION found!") + ' Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!") + ' End If - Dim oDataRow As DataRow = oDatatable.Rows.Item(0) - Dim oConString = My.DatabaseECM.GetConnectionString( - oDataRow.Item("SERVER").ToString, - oDataRow.Item("DATENBANK").ToString, - oDataRow.Item("USERNAME").ToString, - oDataRow.Item("PASSWORD").ToString - ) + ' Dim oDataRow As DataRow = oDatatable.Rows.Item(0) + ' Dim oConString = My.DatabaseECM.GetConnectionString( + ' oDataRow.Item("SERVER").ToString, + ' oDataRow.Item("DATENBANK").ToString, + ' oDataRow.Item("USERNAME").ToString, + ' oDataRow.Item("PASSWORD").ToString + ' ) - Dim oDecryptedConnectionString = MSSQLServer.DecryptConnectionString(oConString) - My.DatabaseIDB = New MSSQLServer(My.LogConfig, oDecryptedConnectionString) - End If + ' Dim oDecryptedConnectionString = MSSQLServer.DecryptConnectionString(oConString) + ' My.DatabaseIDB = New MSSQLServer(My.LogConfig, oDecryptedConnectionString) + 'End If - If My.DatabaseIDB.DBInitialized = False Then - Logger.Warn("Could not initialize IDB-Database!") - Throw New InitException("Could not initialize IDB-Database!") - End If + 'If My.DatabaseIDB.DBInitialized = False Then + ' Logger.Warn("Could not initialize IDB-Database!") + ' Throw New InitException("Could not initialize IDB-Database!") + 'End If End Sub Private Sub InitializeService(MyApplication As My.MyApplication) Try @@ -137,6 +137,12 @@ Public Class ClassInit End Sub Private Sub InitializeDatabaseWithFallback(MyApplication As My.MyApplication) Try + Dim oECMConnectionString = MyApplication.Service.Client.ClientConfig.ConnectionStringECM + My.DatabaseECM = New MSSQLServer(My.LogConfig, oECMConnectionString) + + Dim oIDBConnectionString = MyApplication.Service.Client.ClientConfig.ConnectionStringIDB + My.DatabaseIDB = New MSSQLServer(My.LogConfig, oIDBConnectionString) + My.Database = New DatabaseWithFallback(LogConfig, My.Application.Service.Client, My.DatabaseECM, My.DatabaseIDB) Catch ex As Exception Logger.Error(ex) @@ -262,23 +268,23 @@ Public Class ClassInit #End Region Private Function SetupDatabase() As Boolean - If My.SystemConfig.ConnectionString = String.Empty Then - Dim oConnectionString = My.SystemConfig.ConnectionString - Dim oForm As New frmSQLConfig(My.LogConfig) With { - .ConnectionString = oConnectionString, - .FormTitle = "ECM Datenbank" - } - Dim oResult = oForm.ShowDialog() + 'If My.SystemConfig.ConnectionString = String.Empty Then + ' Dim oConnectionString = My.SystemConfig.ConnectionString + ' Dim oForm As New frmSQLConfig(My.LogConfig) With { + ' .ConnectionString = oConnectionString, + ' .FormTitle = "ECM Datenbank" + ' } + ' Dim oResult = oForm.ShowDialog() - If oResult = DialogResult.OK Then - My.SystemConfig.ConnectionString = oForm.ConnectionString - My.SystemConfigManager.Save() + ' If oResult = DialogResult.OK Then + ' My.SystemConfig.ConnectionString = oForm.ConnectionString + ' My.SystemConfigManager.Save() - Return True - Else - Return False - End If - End If + ' Return True + ' Else + ' Return False + ' End If + 'End If Return True End Function diff --git a/GUIs.ZooFlow/Modules/Globix/Models/WorkFile.vb b/GUIs.ZooFlow/Modules/Globix/Models/WorkFile.vb index ed7ffa85..8baf66ad 100644 --- a/GUIs.ZooFlow/Modules/Globix/Models/WorkFile.vb +++ b/GUIs.ZooFlow/Modules/Globix/Models/WorkFile.vb @@ -4,6 +4,11 @@ Public Id As Integer Public IsAttachment As Boolean = False Public HotfolderFile As Boolean = False + + Public Sub New(pId As Integer) + Id = pId + End Sub + Public Overrides Function ToString() As String Return FilePath End Function diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index d75c3bc5..a6947243 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -1120,6 +1120,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property managedatasource3() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("managedatasource3", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index 494db6d1..6b33dc08 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -145,6 +145,9 @@ ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\action_add_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\StatusAnnotations_Stop_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -196,9 +199,6 @@ ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ZooFlow_Sidebar_individuelle_suche.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -283,6 +283,9 @@ ..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\definednameuseinformula2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\save5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -316,8 +319,8 @@ ..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -337,9 +340,6 @@ ..\Resources\markcomplete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\save6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -391,6 +391,9 @@ ..\Resources\ZooFlow_drop_drag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ZooFlow_Sidebar_TOP.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -421,9 +424,6 @@ ..\Resources\del5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\ZooFlow_Sidebar_TOP_Drop.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -478,6 +478,9 @@ ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -496,11 +499,11 @@ ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ZooFlow_Sidebar_TOP.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\StatusAnnotations_Information_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\definednameuseinformula2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\ZooFlow_Sidebar_individuelle_suche.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\bo_appointment.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -514,8 +517,8 @@ ..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\StatusAnnotations_Information_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -562,7 +565,7 @@ ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\action_add_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\managedatasource3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/managedatasource3.svg b/GUIs.ZooFlow/Resources/managedatasource3.svg new file mode 100644 index 00000000..d08be544 --- /dev/null +++ b/GUIs.ZooFlow/Resources/managedatasource3.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 463b923b..bdf0d917 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -1089,6 +1089,7 @@ + diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 3865389f..db565341 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -51,7 +51,6 @@ Partial Class frmFlowForm Me.btnBasicConfig = New DevExpress.XtraBars.BarButtonItem() Me.btnGlobixConfig = New DevExpress.XtraBars.BarButtonItem() Me.btnServiceConfig = New DevExpress.XtraBars.BarButtonItem() - Me.btnDatabaseConfig = New DevExpress.XtraBars.BarButtonItem() Me.btnRestartZooflow = New DevExpress.XtraBars.BarButtonItem() Me.bbtnitmAusblenden = New DevExpress.XtraBars.BarButtonItem() Me.btnExitZooflow = New DevExpress.XtraBars.BarButtonItem() @@ -162,7 +161,7 @@ Partial Class frmFlowForm Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.PictureBoxSearch.Cursor = System.Windows.Forms.Cursors.Hand Me.PictureBoxSearch.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxSearch.Location = New System.Drawing.Point(21, 281) + Me.PictureBoxSearch.Location = New System.Drawing.Point(21, 280) Me.PictureBoxSearch.Name = "PictureBoxSearch" Me.PictureBoxSearch.Size = New System.Drawing.Size(158, 50) Me.PictureBoxSearch.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom @@ -182,7 +181,7 @@ Partial Class frmFlowForm Me.pnlQuicksearch1.Controls.Add(Me.PictureEditQuicksearch1) Me.pnlQuicksearch1.Controls.Add(Me.lblQuicksearch1) Me.pnlQuicksearch1.Dock = System.Windows.Forms.DockStyle.Bottom - Me.pnlQuicksearch1.Location = New System.Drawing.Point(0, 336) + Me.pnlQuicksearch1.Location = New System.Drawing.Point(0, 335) Me.pnlQuicksearch1.Name = "pnlQuicksearch1" Me.pnlQuicksearch1.Size = New System.Drawing.Size(202, 75) Me.pnlQuicksearch1.TabIndex = 16 @@ -224,7 +223,7 @@ Partial Class frmFlowForm Me.BarManager1.DockControls.Add(Me.barDockControlLeft) Me.BarManager1.DockControls.Add(Me.barDockControlRight) Me.BarManager1.Form = Me - Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarSubItem1, Me.btnExitZooflow, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.btnRestartZooflow, Me.btnServiceConfig, Me.btnDatabaseConfig, Me.btnBasicConfig, Me.btnGlobixConfig, Me.bbtnitmAusblenden}) + Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarSubItem1, Me.btnExitZooflow, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.btnRestartZooflow, Me.btnServiceConfig, Me.btnBasicConfig, Me.btnGlobixConfig, Me.bbtnitmAusblenden}) Me.BarManager1.MaxItemId = 12 Me.BarManager1.StatusBar = Me.Bar3 ' @@ -247,7 +246,7 @@ Partial Class frmFlowForm Me.BarSubItem1.Caption = "Menu" Me.BarSubItem1.Id = 0 Me.BarSubItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarSubItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.btnBasicConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnGlobixConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnServiceConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnDatabaseConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnRestartZooflow), New DevExpress.XtraBars.LinkPersistInfo(Me.bbtnitmAusblenden), New DevExpress.XtraBars.LinkPersistInfo(Me.btnExitZooflow)}) + Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.btnBasicConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnGlobixConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnServiceConfig), New DevExpress.XtraBars.LinkPersistInfo(Me.btnRestartZooflow), New DevExpress.XtraBars.LinkPersistInfo(Me.bbtnitmAusblenden), New DevExpress.XtraBars.LinkPersistInfo(Me.btnExitZooflow)}) Me.BarSubItem1.Name = "BarSubItem1" Me.BarSubItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' @@ -272,13 +271,6 @@ Partial Class frmFlowForm Me.btnServiceConfig.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.servermode Me.btnServiceConfig.Name = "btnServiceConfig" ' - 'btnDatabaseConfig - ' - Me.btnDatabaseConfig.Caption = "Datenbankkonfiguration" - Me.btnDatabaseConfig.Id = 8 - Me.btnDatabaseConfig.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.managedatasource2 - Me.btnDatabaseConfig.Name = "btnDatabaseConfig" - ' 'btnRestartZooflow ' Me.btnRestartZooflow.Caption = "Zooflow neustarten" @@ -314,9 +306,9 @@ Partial Class frmFlowForm Me.barDockControlBottom.Appearance.Options.UseBackColor = True Me.barDockControlBottom.CausesValidation = False Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom - Me.barDockControlBottom.Location = New System.Drawing.Point(0, 613) + Me.barDockControlBottom.Location = New System.Drawing.Point(0, 612) Me.barDockControlBottom.Manager = Me.BarManager1 - Me.barDockControlBottom.Size = New System.Drawing.Size(202, 25) + Me.barDockControlBottom.Size = New System.Drawing.Size(202, 26) ' 'barDockControlLeft ' @@ -324,7 +316,7 @@ Partial Class frmFlowForm Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left Me.barDockControlLeft.Location = New System.Drawing.Point(0, 0) Me.barDockControlLeft.Manager = Me.BarManager1 - Me.barDockControlLeft.Size = New System.Drawing.Size(0, 613) + Me.barDockControlLeft.Size = New System.Drawing.Size(0, 612) ' 'barDockControlRight ' @@ -332,7 +324,7 @@ Partial Class frmFlowForm Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right Me.barDockControlRight.Location = New System.Drawing.Point(202, 0) Me.barDockControlRight.Manager = Me.BarManager1 - Me.barDockControlRight.Size = New System.Drawing.Size(0, 613) + Me.barDockControlRight.Size = New System.Drawing.Size(0, 612) ' 'BarButtonItem2 ' @@ -376,7 +368,7 @@ Partial Class frmFlowForm Me.Panel3.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Panel3.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) - Me.Panel3.Location = New System.Drawing.Point(21, 273) + Me.Panel3.Location = New System.Drawing.Point(21, 272) Me.Panel3.Name = "Panel3" Me.Panel3.Size = New System.Drawing.Size(158, 2) Me.Panel3.TabIndex = 17 @@ -412,7 +404,7 @@ Partial Class frmFlowForm Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel2.Location = New System.Drawing.Point(0, 202) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(202, 411) + Me.Panel2.Size = New System.Drawing.Size(202, 410) Me.Panel2.TabIndex = 17 ' 'AdornerUIManager1 @@ -500,7 +492,6 @@ Partial Class frmFlowForm Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnRestartZooflow As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnServiceConfig As DevExpress.XtraBars.BarButtonItem - Friend WithEvents btnDatabaseConfig As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnBasicConfig As DevExpress.XtraBars.BarButtonItem Friend WithEvents Panel2 As Panel Friend WithEvents btnGlobixConfig As DevExpress.XtraBars.BarButtonItem diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 4c52b69d..211a0f3d 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -647,12 +647,14 @@ Public Class frmFlowForm Exit Function End If + PictureEdit2.Image = My.Resources.ZooFlow_drop + 'Erstmal alles löschen My.Database.ExecuteNonQueryECM("DELETE FROM TBGI_FILES_USER WHERE USER@WORK = '" & My.Application.User.UserName & "'") Dim oDroppedFiles = FileDropNew.GetFiles(e) If oDroppedFiles.Count > 0 Then - Await Globix_Check_Dropped_Files(oDroppedFiles) + Await Globix_CheckDroppedFiles(oDroppedFiles) End If End Function @@ -660,7 +662,7 @@ Public Class frmFlowForm Await DragDropForm(e) End Sub - Private Async Function Globix_Check_Dropped_Files(pDroppedFiles As List(Of FileDrop.DroppedFile)) As Threading.Tasks.Task + Private Async Function Globix_CheckDroppedFiles(pDroppedFiles As List(Of FileDrop.DroppedFile)) As Threading.Tasks.Task Try Await My.Database.ExecuteNonQueryECMAsync($"DELETE FROM TBGI_FILES_USER WHERE WORKED = 1 AND USER@WORK = '{My.Application.User.UserName}'") @@ -697,8 +699,7 @@ Public Class frmFlowForm Dim oFilePath As String = oRow.Item("FILENAME2WORK").ToString Dim oFileId As Integer = oRow.Item("GUID") - My.Application.Globix.CurrentWorkfile = New Globix.Models.WorkFile With { - .Id = oFileId, + My.Application.Globix.CurrentWorkfile = New Globix.Models.WorkFile(oFileId) With { .FilePath = oFilePath } @@ -706,8 +707,6 @@ Public Class frmFlowForm If IO.File.Exists(My.Application.Globix.CurrentWorkfile.FilePath) = True And My.Application.Globix.DTACTUAL_FILES.Rows.Count > 0 Then Globix_Open_IndexDialog() - - PictureEdit2.Image = My.Resources.ZooFlow_drop_drag End If Next Catch ex As Exception @@ -907,11 +906,10 @@ Public Class frmFlowForm handleType = "|FW_SIMPLEINDEXER|" End If If FileHandle.CheckDuplicateFiles(FileForWork, "FolderWatch") Then - My.Application.Globix.CurrentWorkfile = New Globix.Models.WorkFile With { - .Id = DirectCast(row.Item("GUID"), Integer), - .FilePath = FileForWork, - .HotfolderFile = True - } + My.Application.Globix.CurrentWorkfile = New Globix.Models.WorkFile(row.Item("GUID")) With { + .FilePath = FileForWork, + .HotfolderFile = True + } Globix_Open_IndexDialog() Else My.Database.ExecuteNonQueryECM(oDel) @@ -1231,7 +1229,7 @@ Public Class frmFlowForm frmServiceConfig.ShowDialog() End Sub - Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnDatabaseConfig.ItemClick + Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Dim oForm As New frmSQLConfig(My.LogConfig) With { .ConnectionString = My.SystemConfig.ConnectionString, .FormTitle = "ECM Datenbank" diff --git a/GUIs.ZooFlow/frmServiceConfig.vb b/GUIs.ZooFlow/frmServiceConfig.vb index ac26a144..dc85e30e 100644 --- a/GUIs.ZooFlow/frmServiceConfig.vb +++ b/GUIs.ZooFlow/frmServiceConfig.vb @@ -32,6 +32,7 @@ Public Class frmServiceConfig My.SystemConfig.AppServerConfig = $"{oIPAddress}:{oPort.ToString}" My.SystemConfigManager.Save() lblStatus.Text = "Successfully Connected to service" + Else lblStatus.Text = "Connection not successful." ' TODO: Make a connection test that is as elaborate as this one :D @@ -46,8 +47,6 @@ Public Class frmServiceConfig ' lblStatus.Text = "Unbekannter Fehler." 'End Select End If - - DialogResult = DialogResult.OK Catch ex As Exception Logger.Error(ex) MsgBox("Fehler beim Verbindungsaufbau", MsgBoxStyle.Critical, Text)