diff --git a/app/DD_PM_WINDREAM/App.config b/app/DD_PM_WINDREAM/App.config index fab7b8d..5d95c6d 100644 --- a/app/DD_PM_WINDREAM/App.config +++ b/app/DD_PM_WINDREAM/App.config @@ -12,10 +12,10 @@ - True + False - PROD + DEV diff --git a/app/DD_PM_WINDREAM/ApplicationEvents.vb b/app/DD_PM_WINDREAM/ApplicationEvents.vb index bfa8993..2cd0a8c 100644 --- a/app/DD_PM_WINDREAM/ApplicationEvents.vb +++ b/app/DD_PM_WINDREAM/ApplicationEvents.vb @@ -1,4 +1,7 @@ -Imports Microsoft.VisualBasic.ApplicationServices +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.EDMI.API +Imports DigitalData.Modules.ZooFlow +Imports Microsoft.VisualBasic.ApplicationServices Namespace My ' Für MyApplication sind folgende Ereignisse verfügbar: @@ -8,6 +11,8 @@ Namespace My ' StartupNextInstance: Wird beim Starten einer Einzelinstanzanwendung ausgelöst, wenn die Anwendung bereits aktiv ist. ' NetworkAvailabilityChanged: Wird beim Herstellen oder Trennen der Netzwerkverbindung ausgelöst. Partial Friend Class MyApplication + + Private Sub MyApplication_UnhandledException(sender As Object, e As UnhandledExceptionEventArgs) Handles Me.UnhandledException Dim oMessage = "Application encountered an unhandled error!" & vbNewLine & vbNewLine & "The errormessage was:" & vbNewLine & e.Exception.Message & vbNewLine & @@ -19,7 +24,7 @@ Namespace My If DEBUG = True Then Dim oLogMessage = LOGCONFIG.Logs.Last() Dim oLogSplit As String() = oLogMessage.Split("|") - Dim oDBMessage = PrepareLogMessage(oLogMessage) & $" [Machinename: {Environment.MachineName}]" + Dim oDBMessage = PrepareLogMessage(oLogMessage) & $" [Machinename: {System.Environment.MachineName}]" Dim oSQL = $"INSERT INTO [dbo].[TBPM_LOG_DEBUG] ([USERID], [LOGMSG], [ADDED_WHEN], DATE_STR) VALUES({USER_ID},'{oDBMessage}',GETDATE(),'{Now}')" DatabaseFallback.ExecuteNonQueryECM(oSQL) @@ -27,8 +32,9 @@ Namespace My Catch ex As Exception LOGGER.Error(ex) End Try - MsgBox(oMessage, MsgBoxStyle.Critical, "Flow Task") End Sub + End Class + End Namespace diff --git a/app/DD_PM_WINDREAM/ClassConstants.vb b/app/DD_PM_WINDREAM/ClassConstants.vb new file mode 100644 index 0000000..183a83c --- /dev/null +++ b/app/DD_PM_WINDREAM/ClassConstants.vb @@ -0,0 +1,5 @@ +Public Class ClassConstants + Public Const OpModeFS_PWM = "PURE_WM" + Public Const OpModeFS_IDBWM = "IDB_WM" + Public Const OpModeFS_ZF = "ZOOFLOW" +End Class diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index 65efef1..bb7e86e 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -45,10 +45,6 @@ Public Class ClassInit Public Sub InitUserConfig() Try - 'DataASorDB = New ClassDataASorDB - - - Dim oUserAppDataPath As String = Application.UserAppDataPath Dim oLegacyAppDataPath As String = Application.UserAppDataPath Dim oCommonAppDataPath = Application.CommonAppDataPath @@ -76,47 +72,47 @@ Public Class ClassInit CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, oUserAppDataPath, oCommonAppDataPath, oStartupPath) LOGGER.Info("Config loaded") + Try + If CONFIG.Config.ConnectionStringTest <> String.Empty And CONFIG.Config.TestMode = True Then + LOGGER.Debug("Test Connection String loaded") + CONNECTION_STRING_ECM = DecryptConnectionString(CONFIG.Config.ConnectionStringTest) + Else + LOGGER.Debug("Connection String loaded") + CONNECTION_STRING_ECM = DecryptConnectionString(CONFIG.Config.ConnectionString) + End If + Catch ex As Exception + LOGGER.Error(ex, "Unexpected Error Getting CONFIG.TestMode or CONFIG.ConnectionStringTest") + End Try - If CONFIG.Config.ConnectionStringTest <> String.Empty And CONFIG.Config.TestMode = True Then - LOGGER.Debug("Test Connection String loaded") - CONNECTION_STRING_ECM = DecryptConnectionString(CONFIG.Config.ConnectionStringTest) - Else - LOGGER.Debug("Connection String loaded") - CONNECTION_STRING_ECM = DecryptConnectionString(CONFIG.Config.ConnectionString) - End If + Try + If CONFIG.Config.EDMIAppServer <> String.Empty Then + Try + LOGGER.Info($"Configuration EDMIAppServer [{CONFIG.Config.EDMIAppServer}] will be used...") - 'If CONFIG.Config.ConnectionStringAppServer <> String.Empty Then - ' LOGGER.Debug("ConnectionStringAppServer will be used") - ' CONNECTION_STRING_APP_SERVER = DecryptConnectionString(CONFIG.Config.ConnectionStringAppServer) - ' CONNECTION_STRING_READ = CONNECTION_STRING_APP_SERVER - 'Else - ' CONNECTION_STRING_READ = CONNECTION_STRING_ECM - 'End If + _Client = New Client(LOGCONFIG, CONFIG.Config.EDMIAppServer) + If Not IsNothing(_Client) Then + If _Client.Connect() Then + EDMIAppServerActive = True + EDMIService.Client = _Client + EDMIService.Address = CONFIG.Config.EDMIAppServer - If CONFIG.Config.EDMIAppServer <> String.Empty Then - Try - 'Dim oSplit() = CONFIG.Config.EDMIAppServer.ToString.Split(";") - 'Dim oAppServer = oSplit(0) - 'Dim oAppServerPort = 9000 - 'If oSplit.Length = 2 Then - ' oAppServerPort = oSplit(1) - 'End If - _Client = New Client(LOGCONFIG, CONFIG.Config.EDMIAppServer) - If Not IsNothing(_Client) Then - If _Client.Connect() Then - EDMIAppServerActive = True - LOGGER.Info($"EDMIAppServer [{CONFIG.Config.EDMIAppServer}] is active!") - Else - LOGGER.Warn($"#### !!! Could not Connect to APPServer [{CONFIG.Config.EDMIAppServer}]!!! ###") + LOGGER.Info($"EDMIAppServer [{CONFIG.Config.EDMIAppServer}] is active!") + Else + LOGGER.Warn($"#### !!! Could not Connect to APPServer [{CONFIG.Config.EDMIAppServer}]!!! ###") + End If End If - End If - Catch ex As Exception - LOGGER.Warn($"Could not initialize the AppServer: {ex.Message}") - End Try + Catch ex As Exception + LOGGER.Warn($"Could not initialize the AppServer: {ex.Message}") + End Try + + Else + LOGGER.Debug("EDMI Server Address not found. Skipping.") + End If + Catch ex As Exception + LOGGER.Error(ex, "Unexpected Error Getting CONFIG.EDMIAppServer") + End Try + - Else - LOGGER.Debug("EDMI Server Address not found. Skipping.") - End If INDEX_DMS_ERSTELLT = CONFIG.Config.IndexDmsErstellt INDEX_DMS_ERSTELLT_ZEIT = CONFIG.Config.IndexDmsErstelltZeit @@ -161,20 +157,32 @@ Public Class ClassInit End Function - Public Function InitDatabase() - + Public Function InitDatabase(GetCSFromAppServ As Boolean) + If GetCSFromAppServ = True Then + LOGGER.Info("Getting DatabaseInfo from ApplicationServer...") + End If Dim Database_ECM As MSSQLServer = Nothing Dim Database_IDB As MSSQLServer = Nothing - If CONNECTION_STRING_ECM = String.Empty Then - MsgBox("No Databaseconnection configured. (First Start or Appdata not accessible)" & vbNewLine & "Basic-Config will be loaded.", MsgBoxStyle.Information) - ERROR_STATE = "NO DB-CONNECTION" - frmKonfig.ShowDialog() + If GetCSFromAppServ = False Then + If CONNECTION_STRING_ECM = String.Empty Then + MsgBox("No Databaseconnection configured. (First Start or Appdata not accessible)" & vbNewLine & "Basic-Config will be loaded.", MsgBoxStyle.Information) + ERROR_STATE = "NO DB-CONNECTION" + frmKonfig.ShowDialog() + End If End If - Database_ECM = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_ECM) + Dim oCSECM As String + If GetCSFromAppServ = False Then + oCSECM = CONNECTION_STRING_ECM + Else + oCSECM = EDMIService.Client.ClientConfig.ConnectionStringECM + CONNECTION_STRING_ECM = oCSECM + End If + + Database_ECM = New MSSQLServer(LOGCONFIG, oCSECM) If Database_ECM.DBInitialized = True Then - 'ClassDatabase.Init(CONNECTION_STRING_ECM) dbECMInitialized = True + DatabaseECM = Database_ECM Else dbECMInitialized = False End If @@ -183,21 +191,27 @@ Public Class ClassInit MsgBox("Error in InitDatabase. (Connection DD_ECM failed) More information in the logfile.", MsgBoxStyle.Critical) Return False End If - - If CONNECTION_STRING_IDB <> String.Empty Then - LOGGER.Debug("IDB Connection String exists, initializing IDB Database") - - Database_IDB = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_IDB) + If GetCSFromAppServ = True Or (GetCSFromAppServ = False And CONNECTION_STRING_IDB <> String.Empty) Then + Dim oCSIDB As String + If GetCSFromAppServ = False Then + oCSIDB = CONNECTION_STRING_IDB + Else + oCSIDB = EDMIService.Client.ClientConfig.ConnectionStringIDB + End If + Database_IDB = New MSSQLServer(LOGCONFIG, oCSIDB) If Database_IDB.DBInitialized = True Then + CONNECTION_STRING_IDB = oCSIDB + DatabaseIDB = Database_IDB dbIDBInitialized = True IDB_ACTIVE = True LOGGER.Info("IDB is active via Config") End If - Else - LOGGER.Debug("IDB Connection String does not exist!") End If + + + ' We initialize the Class in anycase. ' If there is no client, it will fall back to the db by itself DatabaseFallback = New DatabaseWithFallback(LOGCONFIG, _Client, Database_ECM, Database_IDB) @@ -321,6 +335,15 @@ Public Class ClassInit USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS") USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN") + + User.IsAdmin = USER_IS_ADMIN + User.Surname = USER_SURNAME + User.GivenName = USER_PRENAME + User.Email = USER_EMAIL + User.UserName = USER_USERNAME + User.UserId = USER_ID + User.Language = USER_LANGUAGE + Try USER_RIGHT_FILE_DELETE = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")), False, DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")) @@ -467,7 +490,7 @@ Public Class ClassInit .FilterExpression = "TYPE = 'DOC'", .SortByColumn = "PROFILE_ID,TAB_INDEX" }) - BASEDATA_DT_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Clone() + DT_FILTERED_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Clone() oStep = "TBPM_MAIN_VIEW_GROUPS" oSql = "SELECT * FROM TBPM_MAIN_VIEW_GROUPS WHERE ACTIVE = 1" diff --git a/app/DD_PM_WINDREAM/ClassParamRefresh.vb b/app/DD_PM_WINDREAM/ClassParamRefresh.vb index 75c63b4..27941dc 100644 --- a/app/DD_PM_WINDREAM/ClassParamRefresh.vb +++ b/app/DD_PM_WINDREAM/ClassParamRefresh.vb @@ -59,6 +59,11 @@ Public Class ClassParamRefresh ElseIf oMode = "PM.DEBUG_LOG" Then DEBUG = True LOGCONFIG.Debug = True + ElseIf oMode.StartsWith("OPERATION_MODE_FS") Then + OPERATION_MODE_FS = oMode.Replace("OPERATION_MODE_FS=", "") + If OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM Then + IDB_USES_WMFILESTORE = True + End If ElseIf oMode = "PM.IDBWITHWMFS" Then IDB_USES_WMFILESTORE = True ElseIf oMode = "PM.NO_BASICCONF" Then diff --git a/app/DD_PM_WINDREAM/ClassSQLEditor.vb b/app/DD_PM_WINDREAM/ClassSQLEditor.vb index 51a508a..0f269c2 100644 --- a/app/DD_PM_WINDREAM/ClassSQLEditor.vb +++ b/app/DD_PM_WINDREAM/ClassSQLEditor.vb @@ -2,6 +2,7 @@ Imports System.Drawing.Design Imports System.Windows.Forms.Design Imports DD_ProcessManager.InputProperties +Imports DigitalData.GUIs.Common Public Class ClassSQLEditor Inherits UITypeEditor @@ -16,11 +17,11 @@ Public Class ClassSQLEditor If svc IsNot Nothing AndAlso SQLSTring IsNot Nothing Then 'CURRENT_DESIGN_TYPE = "INPUT_INDEX" - Using Form As New frmSQL_DESIGNER() - Form.SQLCommand = SQLSTring - If svc.ShowDialog(Form) = DialogResult.OK Then - Dim sql As New SQLValue(Form.SQLCommand) - CURRENT_SQL_CON = Form.ConnectionID + Using oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) + oForm.SQLCommand = SQLSTring + If svc.ShowDialog(oForm) = DialogResult.OK Then + Dim sql As New SQLValue(oForm.SQLCommand) + CURRENT_SQL_CON = oForm.SQLConnection value = sql End If End Using diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index 5f14483..bb3a254 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -16,6 +16,7 @@ v4.6.1 + false publish\ true Disk @@ -28,7 +29,6 @@ true 0 1.0.0.%2a - false false true @@ -163,6 +163,10 @@ ..\..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll + + False + ..\..\..\DDMonorepo\Modules.Base\Base\bin\Debug\DigitalData.Modules.Base.dll + ..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll @@ -180,6 +184,10 @@ False ..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll + + False + ..\..\..\DDMonorepo\Modules.ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll + P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll @@ -252,6 +260,7 @@ + @@ -477,12 +486,6 @@ Form - - frmSQL_DESIGNER.vb - - - Form - frmUserKonfig_AddUsers.vb @@ -510,6 +513,7 @@ True Application.myapp + True True @@ -651,9 +655,6 @@ frmMain.vb Designer - - frmSQL_DESIGNER.vb - frmUserKonfig_AddUsers.vb diff --git a/app/DD_PM_WINDREAM/ModuleMySettings.vb b/app/DD_PM_WINDREAM/ModuleMySettings.vb index 091794e..11c8ac2 100644 --- a/app/DD_PM_WINDREAM/ModuleMySettings.vb +++ b/app/DD_PM_WINDREAM/ModuleMySettings.vb @@ -6,6 +6,7 @@ Public IDB_ACTIVE As Boolean = False Public EDMIAppServerActive As Boolean = False + Public OPERATION_MODE_FS As String = "PURE_WM" Public IDB_USES_WMFILESTORE As Boolean = False Public BASIC_CONF_VISIBLE As Boolean = True Public IDB_DOC_DATA_SQL As String diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index 27be0d8..407cd92 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -3,9 +3,15 @@ Imports DigitalData.Modules.Config Imports DigitalData.Modules.Logging Imports DigitalData.Modules.EDMI.API Imports DigitalData.Modules.Database +Imports DigitalData.Modules.ZooFlow Module ModuleRuntimeVariables + Public Property Database As DatabaseWithFallback + Public Property DatabaseECM As MSSQLServer + Public Property DatabaseIDB As MSSQLServer + Public Property EDMIService As New State.ServiceState + Public Property User As New State.UserState ' Diese Werte müssen später zur Laufzeit geladen werden Public Property BASEDATA_DT_TBDD_CONNECTION As DataTable Public Property BASEDATA_DT_TBDD_SQL_COMMANDS As DataTable @@ -14,7 +20,7 @@ Module ModuleRuntimeVariables Public Property BASEDATA_DT_CHARTS As DataTable Public Property BASEDATA_DT_GUI_LANGUAGE_PHRASES As DataTable Public Property BASEDATA_DT_PROFILES_SEARCHES_DOC As DataTable - Public Property BASEDATA_DT_PROFILE_SEARCHES_DOC As DataTable + Public Property DT_FILTERED_PROFILE_SEARCHES_DOC As DataTable Public Property BASEDATA_DT_PROFILES_SEARCHES_SQL As DataTable Public Property BASEDATA_DT_PROFILE_SEARCHES_SQL As DataTable diff --git a/app/DD_PM_WINDREAM/My Project/Application.Designer.vb b/app/DD_PM_WINDREAM/My Project/Application.Designer.vb index 515756a..b60cf7d 100644 --- a/app/DD_PM_WINDREAM/My Project/Application.Designer.vb +++ b/app/DD_PM_WINDREAM/My Project/Application.Designer.vb @@ -24,10 +24,10 @@ Namespace My _ Public Sub New() MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) - Me.IsSingleInstance = false + Me.IsSingleInstance = true Me.EnableVisualStyles = true Me.SaveMySettingsOnExit = true - Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses + Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterAllFormsClose End Sub _ diff --git a/app/DD_PM_WINDREAM/My Project/Application.myapp b/app/DD_PM_WINDREAM/My Project/Application.myapp index 5907301..c61f6ed 100644 --- a/app/DD_PM_WINDREAM/My Project/Application.myapp +++ b/app/DD_PM_WINDREAM/My Project/Application.myapp @@ -1,9 +1,9 @@ - + true frmMain - false - 0 + true + 1 true 0 true diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index 9d5dc94..77d2f97 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb b/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb index fc5b321..c20f665 100644 --- a/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb +++ b/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb @@ -291,7 +291,7 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("False")> _ Public ReadOnly Property UseAppConfigConString() As Boolean Get Return CType(Me("UseAppConfigConString"),Boolean) @@ -300,7 +300,7 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("DEV")> _ Public ReadOnly Property UserConfig_Prefix() As String Get Return CType(Me("UserConfig_Prefix"),String) diff --git a/app/DD_PM_WINDREAM/My Project/Settings.settings b/app/DD_PM_WINDREAM/My Project/Settings.settings index 7ff86a9..d2103a0 100644 --- a/app/DD_PM_WINDREAM/My Project/Settings.settings +++ b/app/DD_PM_WINDREAM/My Project/Settings.settings @@ -65,10 +65,10 @@ Normal - True + False - PROD + DEV \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index b02c5a4..a8b99ce 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -247,7 +247,7 @@ 58 - 1062, 229 + 1062, 226 3 @@ -415,7 +415,7 @@ 58 - 1062, 201 + 1062, 199 5 @@ -499,10 +499,10 @@ 1 - 1062, 484 + 1062, 479 - 254 + 251 0 @@ -565,7 +565,7 @@ 58 - 1062, 199 + 1062, 196 3 @@ -688,7 +688,7 @@ 58 - 1062, 231 + 1062, 229 0 @@ -775,10 +775,10 @@ 1 - 1062, 484 + 1062, 479 - 224 + 221 1 @@ -1843,7 +1843,7 @@ 246 - 714, 368 + 714, 363 93 @@ -1870,7 +1870,7 @@ 714, 0 - 323, 368 + 323, 363 91 @@ -1891,7 +1891,7 @@ 3, 23 - 1037, 368 + 1037, 363 94 @@ -1948,7 +1948,7 @@ 3, 3, 3, 3 - 1046, 382 + 1046, 377 0 @@ -2134,7 +2134,7 @@ 3, 3, 3, 3 - 1046, 385 + 1046, 380 1 @@ -2164,7 +2164,7 @@ 3, 3 - 1054, 411 + 1054, 406 92 @@ -2188,7 +2188,7 @@ 3, 3, 3, 3 - 1060, 417 + 1060, 412 1 @@ -2314,7 +2314,7 @@ 3, 3, 3, 3 - 1068, 490 + 1068, 485 0 @@ -2341,7 +2341,7 @@ 3, 3, 3, 3 - 1068, 490 + 1068, 485 1 @@ -2368,7 +2368,7 @@ 3, 3 - 1076, 519 + 1076, 514 1 @@ -2392,7 +2392,7 @@ 3, 3, 3, 3 - 1082, 525 + 1082, 520 1 @@ -3549,7 +3549,7 @@ Top Kreditoren: 3, 3, 3, 3 - 1082, 525 + 1082, 520 2 diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 0d9c9a6..49d647d 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -5,6 +5,7 @@ Imports DD_LIB_Standards Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid.Views.Base Imports DevExpress.XtraGrid.Views.Grid +Imports DigitalData.GUIs.Common Imports DigitalData.Modules.Language.Utils Public Class frmAdministration @@ -228,9 +229,12 @@ Public Class frmAdministration Private Sub Button1_Click(sender As System.Object, e As System.EventArgs) Handles btnWMSuche.Click If IDB_ACTIVE = True Then CURRENT_DESIGN_TYPE = "IDB_SEARCH" - Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = Me.WD_SEARCHTextBox.Text} - Dim oResult = oForm.ShowDialog() - Me.WD_SEARCHTextBox.Text = oForm.SQLCommand + Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {.SQLCommand = Me.WD_SEARCHTextBox.Text, .SQLConnection = 1} + oForm.ShowDialog() + If oForm.DialogResult = DialogResult.OK Then + Me.WD_SEARCHTextBox.Text = oForm.SQLCommand + End If + Else If Not Me.WD_SEARCHTextBox.Text = "" Then Me.dlgWindreamsuche.FileName = Me.WD_SEARCHTextBox.Text @@ -1201,10 +1205,13 @@ Public Class frmAdministration Private Sub BarButtonItem13_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem13.ItemClick Try Dim oSQL = BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") - Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oSQL} - Dim oResult = oForm.ShowDialog() + Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With { + .SQLCommand = oSQL, + .SQLConnection = 1 + } + oForm.ShowDialog() - If oResult = DialogResult.OK Then + If oForm.DialogResult = DialogResult.OK Then DatabaseFallback.ExecuteNonQueryECM(String.Format("UPDATE TBPM_KONFIGURATION SET SQL_PROFILE_MAIN_VIEW = '{0}' WHERE GUID = 1", oForm.SQLCommand.Replace("'", "''"))) BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") = oForm.SQLCommand End If @@ -1344,10 +1351,10 @@ Public Class frmAdministration Try Dim oSQL = BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") CURRENT_DESIGN_TYPE = "SQL_OVERVIEW" - Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oSQL} - Dim oResult = oForm.ShowDialog() + Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {.SQLCommand = oSQL, .SQLConnection = 1} + oForm.ShowDialog() - If oResult = DialogResult.OK Then + If oForm.DialogResult = DialogResult.OK Then DatabaseFallback.ExecuteNonQueryECM(String.Format("UPDATE TBPM_KONFIGURATION SET SQL_PROFILE_MAIN_VIEW = '{0}' WHERE GUID = 1", oForm.SQLCommand.Replace("'", "''"))) BASEDATA_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") = oForm.SQLCommand End If @@ -1364,10 +1371,12 @@ Public Class frmAdministration CURRENT_DESIGN_TYPE = "SQL_PROFILE" Dim oSQL = $"SELECT [SQL_VIEW] FROM TBPM_PROFILE WHERE GUID = {CURRENT_ProfilGUID}" Dim oldSQL = DatabaseFallback.GetScalarValueECM(oSQL) - Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oldSQL} - Dim oResult = oForm.ShowDialog() + Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With { + .SQLCommand = oldSQL, + .SQLConnection = 1} + oForm.ShowDialog() - If oResult = DialogResult.OK Then + If oForm.DialogResult = DialogResult.OK Then If oldSQL <> oForm.SQLCommand Then Dim oUpdate As String = $"Update TBPM_PROFILE SET CHANGED_WHO = '{USER_USERNAME}', SQL_VIEW = '{oForm.SQLCommand.Replace("'", "''")}' WHERE GUID = {CURRENT_ProfilGUID}" If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then @@ -1389,10 +1398,12 @@ Public Class frmAdministration CURRENT_DESIGN_TYPE = "SQL_BTNFINISH" Dim oSQL = $"SELECT SQL_BTN_FINISH FROM TBPM_PROFILE WHERE GUID = {CURRENT_ProfilGUID}" Dim oldSQL = DatabaseFallback.GetScalarValueECM(oSQL) ', CONNECTION_STRING_ECM, "bbtnItemFinishSQL_ItemClick-get SQL_BTN_FINISH") - Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oldSQL} - Dim oResult = oForm.ShowDialog() + Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With { + .SQLCommand = oldSQL, + .SQLConnection = 1} + oForm.ShowDialog() - If oResult = DialogResult.OK Then + If oForm.DialogResult = DialogResult.OK Then If oldSQL <> oForm.SQLCommand Then Dim oUpdate As String = $"Update TBPM_PROFILE SET CHANGED_WHO = '{USER_USERNAME}', SQL_BTN_FINISH = '{oForm.SQLCommand.Replace("'", "''")}' WHERE GUID = {CURRENT_ProfilGUID}" If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then @@ -1654,10 +1665,13 @@ Public Class frmAdministration Private Sub Series2SQL_Click(sender As Object, e As EventArgs) Handles Series1SQL.Click, Series2SQL.Click, Series3SQL.Click, Series4SQL.Click Dim obutton As Button = sender - Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = obutton.Tag} - Dim oResult = oForm.ShowDialog() + Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With { + .SQLCommand = obutton.Tag, + .SQLConnection = 1 + } + oForm.ShowDialog() - If oResult = DialogResult.OK Then + If oForm.DialogResult = DialogResult.OK Then If oForm.SQLCommand <> obutton.Tag Then obutton.Tag = oForm.SQLCommand.Replace(" '", "''") End If diff --git a/app/DD_PM_WINDREAM/frmColumn_Detail.vb b/app/DD_PM_WINDREAM/frmColumn_Detail.vb index 6b3c316..af5dd05 100644 --- a/app/DD_PM_WINDREAM/frmColumn_Detail.vb +++ b/app/DD_PM_WINDREAM/frmColumn_Detail.vb @@ -1,4 +1,6 @@  +Imports DigitalData.GUIs.Common + Public Class frmColumn_Detail Private Class ComboboxItem @@ -110,15 +112,16 @@ Public Class frmColumn_Detail Dim oldSQL = SQL_COMMANDTextBox.Text CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN" CURRENT_INDEX_ID = GUIDTextBox.Text - Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oldSQL} - oForm.TopMost = True - Dim oResult = oForm.ShowDialog() - oForm.BringToFront() + Dim oForm2 As New frmSQLEditor(LOGCONFIG, DatabaseECM) With { + .SQLCommand = SQL_COMMANDTextBox.Text, + .SQLConnection = 1 + } + oForm2.ShowDialog() - If oResult = DialogResult.OK Then - If oldSQL <> oForm.SQLCommand Then - Dim oUpdate As String = $"Update TBPM_CONTROL_TABLE SET CHANGED_WHO = '{USER_USERNAME}', SQL_COMMAND = '{oForm.SQLCommand.Replace("'", "''")}' - , CONNECTION_ID = {oForm.ConnectionID} WHERE GUID = {GUIDTextBox.Text}" + If oForm2.DialogResult = DialogResult.OK Then + If oldSQL <> oForm2.SQLCommand Then + Dim oUpdate As String = $"Update TBPM_CONTROL_TABLE SET CHANGED_WHO = '{USER_USERNAME}', SQL_COMMAND = '{oForm2.SQLCommand.Replace("'", "''")}' + , CONNECTION_ID = {oForm2.SQLConnection} WHERE GUID = {GUIDTextBox.Text}" If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always tslblAenderungen.Caption = "Changes saved - " & Now @@ -158,19 +161,20 @@ Public Class frmColumn_Detail Dim oldSQL = SQL_COMMANDTextBox.Text CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN" CURRENT_INDEX_ID = GUIDTextBox.Text - Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oldSQL} - oForm.TopMost = True - Dim oResult = oForm.ShowDialog() - oForm.BringToFront() + Dim oForm2 As New frmSQLEditor(LOGCONFIG, DatabaseECM) With { + .SQLCommand = SQL_COMMANDTextBox.Text, + .SQLConnection = 1 + } + oForm2.ShowDialog() - If oResult = DialogResult.OK Then - If oldSQL <> oForm.SQLCommand Then - Dim oUpdate As String = $"Update TBPM_CONTROL_TABLE SET CHANGED_WHO = '{USER_USERNAME}', SQL_COMMAND = '{oForm.SQLCommand.Replace("'", "''")}' - , CONNECTION_ID = {oForm.ConnectionID} WHERE GUID = {GUIDTextBox.Text}" + If oForm2.DialogResult = DialogResult.OK Then + If oldSQL <> oForm2.SQLCommand Then + Dim oUpdate As String = $"Update TBPM_CONTROL_TABLE SET CHANGED_WHO = '{USER_USERNAME}', SQL_COMMAND = '{oForm2.SQLCommand.Replace("'", "''")}' + , CONNECTION_ID = {oForm2.SQLConnection} WHERE GUID = {GUIDTextBox.Text}" If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always tslblAenderungen.Caption = "Changes saved - " & Now - SQL_COMMANDTextBox.Text = oForm.SQLCommand + SQL_COMMANDTextBox.Text = oForm2.SQLCommand End If End If diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index 3eab5d1..9139193 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -7,6 +7,7 @@ Imports DevExpress.XtraGrid.Views.Grid.ViewInfo Imports DigitalData.Controls.LookupGrid Imports DigitalData.Modules.Language.Utils Imports System.Drawing +Imports DigitalData.GUIs.Common Public Class frmFormDesigner Public ProfileId As Integer @@ -1146,10 +1147,13 @@ Public Class frmFormDesigner CURRENT_DESIGN_TYPE = "SQL_BTNFINISH" Dim oSQL = $"SELECT SQL_BTN_FINISH FROM TBPM_PROFILE WHERE GUID = {ProfileId}" Dim oldSQL = DatabaseFallback.GetScalarValueECM(oSQL) - Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oldSQL} - Dim oResult = oForm.ShowDialog() + Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With { + .SQLCommand = oldSQL, + .SQLConnection = 1 + } + oForm.ShowDialog() - If oResult = DialogResult.OK Then + If oForm.DialogResult = DialogResult.OK Then If oldSQL <> oForm.SQLCommand Then Dim oUpdate As String = $"Update TBPM_PROFILE SET CHANGED_WHO = '{USER_USERNAME}', SQL_BTN_FINISH = '{oForm.SQLCommand.Replace("'", "''")}' WHERE GUID = {CURRENT_ProfilGUID}" If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 2afa3b0..c3793f0 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -14,6 +14,7 @@ Imports DigitalData.Modules.EDMI.API.Constants Imports DigitalData.GUIs.Common Imports DevExpress.XtraGrid.Views.BandedGrid Imports DevExpress.XtraBars.Ribbon +Imports DigitalData.Modules.ZooFlow Public Class frmMain Private UserLoggedin As Integer = 0 @@ -840,7 +841,7 @@ Public Class frmMain oSQL = oSQL.Replace("@USER_ID", USER_ID) oSQL = oSQL.Replace("@USERNAME", USER_USERNAME) - oSQL = oSQL.Replace("@MACHINE_NAME", Environment.MachineName) + oSQL = oSQL.Replace("@MACHINE_NAME", System.Environment.MachineName) oSQL = oSQL.Replace("@DATE", Now.ToShortDateString) oSQL = oSQL.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) @@ -1298,7 +1299,14 @@ Public Class frmMain End Try End Sub - + Public Function GetEnvironment() As Environment + Return New Environment With { + .Database = DatabaseECM, + .DatabaseIDB = DatabaseIDB, + .Service = EDMIService, + .User = User + } + End Function Sub Load_Profil_from_Grid(pProfilID As Integer) Try @@ -1334,17 +1342,20 @@ Public Class frmMain Exit Sub End If - - BASEDATA_DT_PROFILE_SEARCHES_DOC = Nothing - BASEDATA_DT_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Copy + DT_FILTERED_PROFILE_SEARCHES_DOC = Nothing + DT_FILTERED_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Copy + DT_FILTERED_PROFILE_SEARCHES_DOC.Clear() oExpression = $"PROFILE_ID = {CURRENT_ProfilGUID}" - BASEDATA_DT_PROFILES_SEARCHES_DOC.Select(oExpression, "TAB_INDEX").CopyToDataTable(BASEDATA_DT_PROFILE_SEARCHES_DOC, LoadOption.PreserveChanges) + BASEDATA_DT_PROFILES_SEARCHES_DOC.Select(oExpression, "TAB_INDEX").CopyToDataTable(DT_FILTERED_PROFILE_SEARCHES_DOC, LoadOption.PreserveChanges) + BASEDATA_DT_PROFILE_SEARCHES_SQL = Nothing BASEDATA_DT_PROFILE_SEARCHES_SQL = BASEDATA_DT_PROFILES_SEARCHES_SQL.Copy + BASEDATA_DT_PROFILE_SEARCHES_SQL.Clear() BASEDATA_DT_PROFILES_SEARCHES_SQL.Select(oExpression, "TAB_INDEX").CopyToDataTable(BASEDATA_DT_PROFILE_SEARCHES_SQL, LoadOption.PreserveChanges) Try - _FormValidator = New frmValidator + Dim oEnvironment = GetEnvironment() + _FormValidator = New frmValidator(oEnvironment) AddHandler _FormValidator.FormClosed, AddressOf ValidatorClosed _FormValidator.Show() Catch ex As Exception @@ -1391,6 +1402,7 @@ Public Class frmMain 'Decide_Load() End Sub + 'Public Sub Task_A() ' Dim frmA = New frmValidator() ' Must be created on this thread! ' Application.Run(frmA) @@ -1694,7 +1706,7 @@ Public Class frmMain oSQLOverview = oSQLOverview.Replace("@USER_ID", USER_ID) oSQLOverview = oSQLOverview.Replace("@USERNAME", USER_USERNAME) - oSQLOverview = oSQLOverview.Replace("@MACHINE_NAME", Environment.MachineName) + oSQLOverview = oSQLOverview.Replace("@MACHINE_NAME", System.Environment.MachineName) oSQLOverview = oSQLOverview.Replace("@DATE", Now.ToShortDateString) oSQLOverview = oSQLOverview.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) @@ -2158,7 +2170,6 @@ Public Class frmMain Try Dim oSQL = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", USER_USERNAME, CLIENT_SELECTED) Dim DT_CHECKUSER_MODULE As DataTable - 'DT_CHECKUSER_MODULE = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBDD_USER_MODULE", $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'PM'") DT_CHECKUSER_MODULE = DatabaseFallback.GetDatatable("TBDD_USER_MODULE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With { .FilterExpression = $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'PM'" }) @@ -2185,7 +2196,7 @@ Public Class frmMain .SortByColumn = "PROFILE_ID,TAB_INDEX" }) If pMode = "Load" Then - BASEDATA_DT_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Clone() + DT_FILTERED_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Clone() End If If pMode = "bwBasicData" Then bwBasicData.ReportProgress(50) oSQL = "select * from TBPM_PROFILE_SEARCH where TYPE = 'SQL' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX" @@ -2277,7 +2288,7 @@ Public Class frmMain Private Sub frmMain_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing If Application.OpenForms().OfType(Of frmValidator).Any Then - frmValidator.Close() + _FormValidator.Close() End If End Sub diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb deleted file mode 100644 index 6d8e2a7..0000000 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb +++ /dev/null @@ -1,447 +0,0 @@ - _ -Partial Class frmSQL_DESIGNER - 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.components = New System.ComponentModel.Container() - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQL_DESIGNER)) - Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() - Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() - Me.TBDD_CONNECTIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() - Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.btnShowConnections = New System.Windows.Forms.Button() - Me.Label14 = New System.Windows.Forms.Label() - Me.cmbConnection = New System.Windows.Forms.ComboBox() - Me.SQL_COMMANDTextBox = New System.Windows.Forms.TextBox() - Me.Label4 = New System.Windows.Forms.Label() - Me.Label1 = New System.Windows.Forms.Label() - Me.Label5 = New System.Windows.Forms.Label() - Me.dgvPlaceholders = New System.Windows.Forms.DataGridView() - Me.colPlaceholder = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colReplace = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.btnTestSQL = New System.Windows.Forms.Button() - Me.lbIndexe = New System.Windows.Forms.Label() - Me.cmbIndexe = New System.Windows.Forms.ComboBox() - Me.btnAddIndex = New System.Windows.Forms.Button() - Me.btnSaveSQLCommand = New System.Windows.Forms.Button() - Me.lblSaveFinalIndex = New System.Windows.Forms.Label() - Me.btnAddControl = New System.Windows.Forms.Button() - Me.lblControls = New System.Windows.Forms.Label() - Me.cmbControls = New System.Windows.Forms.ComboBox() - Me.cmbStatic = New System.Windows.Forms.ComboBox() - Me.btnAddStatic = New System.Windows.Forms.Button() - Me.Label2 = New System.Windows.Forms.Label() - Me.cmbUser = New System.Windows.Forms.ComboBox() - Me.Label3 = New System.Windows.Forms.Label() - Me.btnAddUser = New System.Windows.Forms.Button() - Me.GridControl1 = New DevExpress.XtraGrid.GridControl() - Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() - CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.dgvPlaceholders, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'DD_DMSLiteDataSet - ' - Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet" - Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema - ' - 'TableAdapterManager - ' - Me.TableAdapterManager.BackupDataSetBeforeUpdate = False - Me.TableAdapterManager.Connection = Nothing - Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing - Me.TableAdapterManager.TBDD_EMAIL_TEMPLATETableAdapter = Nothing - Me.TableAdapterManager.TBDD_GUI_LANGUAGE_PHRASETableAdapter = Nothing - Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing - Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing - Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing - Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing - Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing - Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing - Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete - ' - 'TBDD_CONNECTIONTableAdapter - ' - Me.TBDD_CONNECTIONTableAdapter.ClearBeforeFill = True - ' - 'TBDD_CONNECTIONBindingSource - ' - Me.TBDD_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION" - Me.TBDD_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet - ' - 'btnShowConnections - ' - Me.btnShowConnections.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnShowConnections.Image = Global.DD_ProcessManager.My.Resources.Resources.database_go1 - Me.btnShowConnections.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnShowConnections.Location = New System.Drawing.Point(220, 31) - Me.btnShowConnections.Name = "btnShowConnections" - Me.btnShowConnections.Size = New System.Drawing.Size(111, 24) - Me.btnShowConnections.TabIndex = 82 - Me.btnShowConnections.Text = "Connections" - Me.btnShowConnections.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnShowConnections.UseVisualStyleBackColor = True - ' - 'Label14 - ' - Me.Label14.AutoSize = True - Me.Label14.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label14.Location = New System.Drawing.Point(12, 9) - Me.Label14.Name = "Label14" - Me.Label14.Size = New System.Drawing.Size(76, 16) - Me.Label14.TabIndex = 81 - Me.Label14.Text = "Connection:" - ' - 'cmbConnection - ' - Me.cmbConnection.DataSource = Me.TBDD_CONNECTIONBindingSource - Me.cmbConnection.DisplayMember = "BEZEICHNUNG" - Me.cmbConnection.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cmbConnection.FormattingEnabled = True - Me.cmbConnection.Location = New System.Drawing.Point(12, 31) - Me.cmbConnection.Name = "cmbConnection" - Me.cmbConnection.Size = New System.Drawing.Size(200, 24) - Me.cmbConnection.TabIndex = 80 - Me.cmbConnection.ValueMember = "GUID" - ' - 'SQL_COMMANDTextBox - ' - Me.SQL_COMMANDTextBox.AcceptsReturn = True - Me.SQL_COMMANDTextBox.AcceptsTab = True - Me.SQL_COMMANDTextBox.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.SQL_COMMANDTextBox.Font = New System.Drawing.Font("Courier New", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.SQL_COMMANDTextBox.Location = New System.Drawing.Point(15, 125) - Me.SQL_COMMANDTextBox.Multiline = True - Me.SQL_COMMANDTextBox.Name = "SQL_COMMANDTextBox" - Me.SQL_COMMANDTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.SQL_COMMANDTextBox.Size = New System.Drawing.Size(898, 167) - Me.SQL_COMMANDTextBox.TabIndex = 86 - ' - 'Label4 - ' - Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(9, 109) - Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(81, 13) - Me.Label4.TabIndex = 85 - Me.Label4.Text = "SQL-Command:" - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Font = New System.Drawing.Font("Segoe UI", 9.0!) - Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label1.Location = New System.Drawing.Point(13, 316) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(65, 15) - Me.Label1.TabIndex = 91 - Me.Label1.Text = "Platzhalter:" - ' - 'Label5 - ' - Me.Label5.AutoSize = True - Me.Label5.Font = New System.Drawing.Font("Segoe UI", 9.0!) - Me.Label5.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label5.Location = New System.Drawing.Point(304, 316) - Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(55, 15) - Me.Label5.TabIndex = 90 - Me.Label5.Text = "Ergebnis:" - ' - 'dgvPlaceholders - ' - Me.dgvPlaceholders.AllowUserToAddRows = False - Me.dgvPlaceholders.AllowUserToDeleteRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan - Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace}) - Me.dgvPlaceholders.Enabled = False - Me.dgvPlaceholders.Location = New System.Drawing.Point(15, 337) - Me.dgvPlaceholders.Name = "dgvPlaceholders" - Me.dgvPlaceholders.Size = New System.Drawing.Size(286, 133) - Me.dgvPlaceholders.TabIndex = 88 - ' - 'colPlaceholder - ' - Me.colPlaceholder.HeaderText = "Platzhalter" - Me.colPlaceholder.Name = "colPlaceholder" - Me.colPlaceholder.ReadOnly = True - ' - 'colReplace - ' - Me.colReplace.HeaderText = "Ersetzung" - Me.colReplace.Name = "colReplace" - ' - 'btnTestSQL - ' - Me.btnTestSQL.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnTestSQL.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle)) - Me.btnTestSQL.Image = CType(resources.GetObject("btnTestSQL.Image"), System.Drawing.Image) - Me.btnTestSQL.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnTestSQL.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnTestSQL.Location = New System.Drawing.Point(745, 302) - Me.btnTestSQL.Name = "btnTestSQL" - Me.btnTestSQL.Size = New System.Drawing.Size(168, 29) - Me.btnTestSQL.TabIndex = 87 - Me.btnTestSQL.Text = "Teste SQL-Command" - Me.btnTestSQL.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnTestSQL.UseVisualStyleBackColor = True - ' - 'lbIndexe - ' - Me.lbIndexe.AutoSize = True - Me.lbIndexe.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lbIndexe.Location = New System.Drawing.Point(678, 13) - Me.lbIndexe.Name = "lbIndexe" - Me.lbIndexe.Size = New System.Drawing.Size(203, 16) - Me.lbIndexe.TabIndex = 93 - Me.lbIndexe.Text = "Index (zur Laufzeit ausgewertet):" - ' - 'cmbIndexe - ' - Me.cmbIndexe.FormattingEnabled = True - Me.cmbIndexe.Location = New System.Drawing.Point(681, 32) - Me.cmbIndexe.Name = "cmbIndexe" - Me.cmbIndexe.Size = New System.Drawing.Size(194, 21) - Me.cmbIndexe.TabIndex = 92 - ' - 'btnAddIndex - ' - Me.btnAddIndex.Image = CType(resources.GetObject("btnAddIndex.Image"), System.Drawing.Image) - Me.btnAddIndex.Location = New System.Drawing.Point(881, 32) - Me.btnAddIndex.Name = "btnAddIndex" - Me.btnAddIndex.Size = New System.Drawing.Size(32, 23) - Me.btnAddIndex.TabIndex = 94 - Me.btnAddIndex.UseVisualStyleBackColor = True - ' - 'btnSaveSQLCommand - ' - Me.btnSaveSQLCommand.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnSaveSQLCommand.DialogResult = System.Windows.Forms.DialogResult.OK - Me.btnSaveSQLCommand.Image = CType(resources.GetObject("btnSaveSQLCommand.Image"), System.Drawing.Image) - Me.btnSaveSQLCommand.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnSaveSQLCommand.Location = New System.Drawing.Point(816, 658) - Me.btnSaveSQLCommand.Name = "btnSaveSQLCommand" - Me.btnSaveSQLCommand.Size = New System.Drawing.Size(95, 30) - Me.btnSaveSQLCommand.TabIndex = 95 - Me.btnSaveSQLCommand.Text = "Speichern" - Me.btnSaveSQLCommand.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnSaveSQLCommand.UseVisualStyleBackColor = True - ' - 'lblSaveFinalIndex - ' - Me.lblSaveFinalIndex.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.lblSaveFinalIndex.AutoSize = True - Me.lblSaveFinalIndex.BackColor = System.Drawing.Color.Yellow - Me.lblSaveFinalIndex.Location = New System.Drawing.Point(304, 658) - Me.lblSaveFinalIndex.Name = "lblSaveFinalIndex" - Me.lblSaveFinalIndex.Size = New System.Drawing.Size(38, 13) - Me.lblSaveFinalIndex.TabIndex = 96 - Me.lblSaveFinalIndex.Text = "Label4" - Me.lblSaveFinalIndex.Visible = False - ' - 'btnAddControl - ' - Me.btnAddControl.Image = CType(resources.GetObject("btnAddControl.Image"), System.Drawing.Image) - Me.btnAddControl.Location = New System.Drawing.Point(643, 32) - Me.btnAddControl.Name = "btnAddControl" - Me.btnAddControl.Size = New System.Drawing.Size(32, 23) - Me.btnAddControl.TabIndex = 99 - Me.btnAddControl.UseVisualStyleBackColor = True - ' - 'lblControls - ' - Me.lblControls.AutoSize = True - Me.lblControls.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblControls.Location = New System.Drawing.Point(442, 13) - Me.lblControls.Name = "lblControls" - Me.lblControls.Size = New System.Drawing.Size(215, 16) - Me.lblControls.TabIndex = 98 - Me.lblControls.Text = "Controls (zur Laufzeit ausgewertet):" - ' - 'cmbControls - ' - Me.cmbControls.FormattingEnabled = True - Me.cmbControls.Location = New System.Drawing.Point(445, 31) - Me.cmbControls.Name = "cmbControls" - Me.cmbControls.Size = New System.Drawing.Size(194, 21) - Me.cmbControls.TabIndex = 97 - ' - 'cmbStatic - ' - Me.cmbStatic.FormattingEnabled = True - Me.cmbStatic.Items.AddRange(New Object() {"USERNAME", "MACHINE", "DOMAIN", "DATE"}) - Me.cmbStatic.Location = New System.Drawing.Point(445, 86) - Me.cmbStatic.Name = "cmbStatic" - Me.cmbStatic.Size = New System.Drawing.Size(194, 21) - Me.cmbStatic.TabIndex = 97 - ' - 'btnAddStatic - ' - Me.btnAddStatic.Image = CType(resources.GetObject("btnAddStatic.Image"), System.Drawing.Image) - Me.btnAddStatic.Location = New System.Drawing.Point(643, 86) - Me.btnAddStatic.Name = "btnAddStatic" - Me.btnAddStatic.Size = New System.Drawing.Size(32, 23) - Me.btnAddStatic.TabIndex = 99 - Me.btnAddStatic.UseVisualStyleBackColor = True - ' - 'Label2 - ' - Me.Label2.AutoSize = True - Me.Label2.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label2.Location = New System.Drawing.Point(442, 67) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(112, 16) - Me.Label2.TabIndex = 98 - Me.Label2.Text = "Umgebungsdaten:" - ' - 'cmbUser - ' - Me.cmbUser.FormattingEnabled = True - Me.cmbUser.Items.AddRange(New Object() {"PRENAME", "SURNAME", "SHORTNAME", "LANGUAGE", "EMAIL", "USER_ID", "PROFILE_ID", "PROFILE_TITLE"}) - Me.cmbUser.Location = New System.Drawing.Point(681, 86) - Me.cmbUser.Name = "cmbUser" - Me.cmbUser.Size = New System.Drawing.Size(194, 21) - Me.cmbUser.TabIndex = 97 - ' - 'Label3 - ' - Me.Label3.AutoSize = True - Me.Label3.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(678, 67) - Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(118, 16) - Me.Label3.TabIndex = 98 - Me.Label3.Text = "Anwendungsdaten:" - ' - 'btnAddUser - ' - Me.btnAddUser.Image = CType(resources.GetObject("btnAddUser.Image"), System.Drawing.Image) - Me.btnAddUser.Location = New System.Drawing.Point(881, 84) - Me.btnAddUser.Name = "btnAddUser" - Me.btnAddUser.Size = New System.Drawing.Size(32, 23) - Me.btnAddUser.TabIndex = 99 - Me.btnAddUser.UseVisualStyleBackColor = True - ' - 'GridControl1 - ' - Me.GridControl1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.GridControl1.Location = New System.Drawing.Point(307, 337) - Me.GridControl1.MainView = Me.GridView1 - Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(604, 318) - Me.GridControl1.TabIndex = 100 - Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) - ' - 'GridView1 - ' - Me.GridView1.GridControl = Me.GridControl1 - Me.GridView1.Name = "GridView1" - ' - 'frmSQL_DESIGNER - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(921, 692) - Me.Controls.Add(Me.GridControl1) - Me.Controls.Add(Me.btnAddUser) - Me.Controls.Add(Me.btnAddStatic) - Me.Controls.Add(Me.btnAddControl) - Me.Controls.Add(Me.Label3) - Me.Controls.Add(Me.Label2) - Me.Controls.Add(Me.lblControls) - Me.Controls.Add(Me.cmbUser) - Me.Controls.Add(Me.cmbStatic) - Me.Controls.Add(Me.cmbControls) - Me.Controls.Add(Me.lblSaveFinalIndex) - Me.Controls.Add(Me.btnSaveSQLCommand) - Me.Controls.Add(Me.btnAddIndex) - Me.Controls.Add(Me.lbIndexe) - Me.Controls.Add(Me.cmbIndexe) - Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.Label5) - Me.Controls.Add(Me.dgvPlaceholders) - Me.Controls.Add(Me.btnTestSQL) - Me.Controls.Add(Me.SQL_COMMANDTextBox) - Me.Controls.Add(Me.Label4) - Me.Controls.Add(Me.btnShowConnections) - Me.Controls.Add(Me.Label14) - Me.Controls.Add(Me.cmbConnection) - Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) - Me.MinimizeBox = False - Me.MinimumSize = New System.Drawing.Size(937, 392) - Me.Name = "frmSQL_DESIGNER" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "SQL - Designer" - CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.dgvPlaceholders, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - Friend WithEvents DD_DMSLiteDataSet As DD_ProcessManager.DD_DMSLiteDataSet - Friend WithEvents TableAdapterManager As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager - Friend WithEvents TBDD_CONNECTIONTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter - Friend WithEvents TBDD_CONNECTIONBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents btnShowConnections As System.Windows.Forms.Button - Friend WithEvents Label14 As System.Windows.Forms.Label - Friend WithEvents cmbConnection As System.Windows.Forms.ComboBox - Friend WithEvents SQL_COMMANDTextBox As System.Windows.Forms.TextBox - Friend WithEvents Label4 As System.Windows.Forms.Label - Friend WithEvents Label1 As System.Windows.Forms.Label - Friend WithEvents Label5 As System.Windows.Forms.Label - Friend WithEvents dgvPlaceholders As System.Windows.Forms.DataGridView - Friend WithEvents colPlaceholder As System.Windows.Forms.DataGridViewTextBoxColumn - Friend WithEvents colReplace As System.Windows.Forms.DataGridViewTextBoxColumn - Friend WithEvents btnTestSQL As System.Windows.Forms.Button - Friend WithEvents lbIndexe As System.Windows.Forms.Label - Friend WithEvents cmbIndexe As System.Windows.Forms.ComboBox - Friend WithEvents btnAddIndex As System.Windows.Forms.Button - Friend WithEvents btnSaveSQLCommand As System.Windows.Forms.Button - Friend WithEvents lblSaveFinalIndex As System.Windows.Forms.Label - Friend WithEvents btnAddControl As Button - Friend WithEvents lblControls As Label - Friend WithEvents cmbControls As ComboBox - Friend WithEvents cmbStatic As ComboBox - Friend WithEvents btnAddStatic As Button - Friend WithEvents Label2 As Label - Friend WithEvents cmbUser As ComboBox - Friend WithEvents Label3 As Label - Friend WithEvents btnAddUser As Button - Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl - Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView -End Class diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.resx b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.resx deleted file mode 100644 index 3f1fc5a..0000000 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.resx +++ /dev/null @@ -1,313 +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 - - - 255, 17 - - - 1032, 17 - - - 17, 17 - - - 1205, 17 - - - True - - - True - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKhJREFUOE+dkb0RAiEQhSnFIgyMyckNLMI6zB0zS0FruBKugdMACFdWecoBw49v - 5ku43W8eh7DWkmcxxhzFP2HB4bqnaZ7IS27OuU341BcW7E7bN5f7ebxNLGCG26QCENo0qQq01qSUIill - kaIAV+Dz0lJMJkhr89BjeRZZCeIfh8UamcDzfbphQRoIMITKYFhQoykogUUQ1n7pFYTxPBDUaAp6+EwL - 8QKzYQ6as7QBdAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn - yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF - TkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAFRJREFUOE9j+P//P0UYTHz79u0/Cfg9EBswAAGKAU5OTnD84f1HOEYWA9FtbW1w - Q8gyAIRhhpBtAAiD9BBlADJGVkNbA4jBowYMSgPIwXADyMf/GQC4A6rkpAjLjQAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn - yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF - TkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn - yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF - TkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn - yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF - TkSuQmCC - - - - - AAABAAMAICAQAAEABADoAgAANgAAACAgAAABAAgAqAgAAB4DAAAgIAAAAQAgAKgQAADGCwAAKAAAACAA - AABAAAAAAQAEAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICA - AACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAP///////wAAAAAAAAAAD/// - ////////8AAAAAAAD//4d3d3d3d3j//wAAAAD/+Hd3d3d3d3d3d4//AAAA/3d3d3d3d3d3d3d3/wAAD/ - d3d3d3d3d3d3d3d3/wAA/3d3d3d3d3d3d3d3d/8AAP93d3d3d3d3d3d3d3f/AAD/d3d3d3d3d3d3d3d3 - /wAA/3d3d3d3d3d3d3d3d/8AAP93d3d3d3d3d3d3d3f/AAD/d3d3d3d3d3d3d3d3/wAA/3d3d3d3d3d3 - d3d3d/8AAP93d3d3d3d3d3d3d3f/AAD/d3d3d3d3d3d3d3d3/wAA/3d3d3d3d3d3d3d3d/8AAP93d3d3 - d3d3d3d3d3f/AAD/d3d3d3d3d3d3d3d3/wAA/3d3d3d3d3d3d3d3d/8AAP93d3d3d3d3d3d3d3f/AAD/ - d3d3d3d3d3d3d3d3/wAA/3d3d3d3d3d3d3d3d/8AAP93d3eI/////4h3d3f/AAD/d3f//////////3d3 - /wAA/3eP///////////4d/8AAP93j///////////+Hf/AAD/d3f//////////3d3/wAAD/d3d4j///// - iHd3f/AAAA//h3d3d3d3d3d3eP/wAAAAD//4d3d3d3d3j//wAAAAAAAP///////////wAAAAAAAAAAD/ - //////8AAAAAAP/AA//+AAB/+AAAH+AAAAfgAAAHwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA - AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA+AA - AAfgAAAH+AAAH/4AAH//wAP/KAAAACAAAABAAAAAAQAIAAAAAAAABAAAAAAAAAAAAAAAAQAAAAEAAAAA - AABCQkIATU1NAG9vbwB5eXkAhoaGAJGRkQCamZkApKOkALOzswDFxMUAycnJANDPzwDm5OUA6+vrAPHv - 8AD29vYA+Pj4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// - /wAAAAAAAAAAAAAAEREQEBAQEBAQEBERAAAAAAAAAAAAAAAAAAAAAAAQEBAQEBAQEBAQEBAQEBAQEBAA - AAAAAAAAAAAAAAAQEBAOCQYDAQEBAQEBAQIDBgkOEBAQAAAAAAAAAAAREBALBAEBAQEBAQEBAQEBAQEB - AQEECxAQEQAAAAAAABAQBQEBAQEBAQEBAQEBAQEBAQEBAQEBBRAQAAAAAAAQEAUBAQEBAQEBAQEBAQEB - AQEBAQEBAQEBBRAQAAAAABAQAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBEBAAAAAAEBABAQEBAQEBAQEB - AQEBAQEBAQEBAQEBAQEQEAAAAAAQEAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBARAQAAAAABAQAQEBAQEB - AQEBAQEBAQEBAQEBAQEBAQEBEBAAAAAAEBABAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEQEAAAAAAQEAEB - AQEBAQEBAQEBAQEBAQEBAQEBAQEBARAQAAAAABAQAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBEBAAAAAA - EBABAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEQEAAAAAAQEAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBARAQ - AAAAABAQAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBEBAAAAAAEBABAQEBAQEBAQEBAQEBAQEBAQEBAQEB - AQEQEAAAAAAQEAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBARAQAAAAABAQAQEBAQEBAQEBAQEBAQEBAQEB - AQEBAQEBEBAAAAAAEBABAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEQEAAAAAAQEAEBAQEBAQEBAQEBAQEB - AQEBAQEBAQEBARAQAAAAABAQAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBEBAAAAAAEBABAQEBAQQICg0P - Dw8PDw8NCggEAQEBAQEQEAAAAAAQEAEBAgcNDw8PDw8PDw8PDw8PDw8NBwIBARAQAAAAABAOAQEMDw8P - Dw8PDw8PDw8PDw8PDw8PDAEBEBAAAAAAEA4BAQwPDw8PDw8PDw8PDw8PDw8PDw8MAQEQEAAAAAAQEAUB - AgcNDw8PDw8PDw8PDw8PDw8NBwIBBRAQAAAAAAAQDgUBAQEECAoNDw8PDw8PDQoIBAEBAQUOEAAAAAAA - ABEQEAsEAQEBAQEBAQEBAQEBAQEBAQQLEBARAAAAAAAAAAAQEBAOCQYDAQEBAQEBAQEDBgkOEBAQAAAA - AAAAAAAAAAAAEBAQEBAQEBAQEBAQEBAQEBAQAAAAAAAAAAAAAAAAAAAAAAARERAQEBAQEBAQEREAAAAA - AAAAAAAA/8AD//4AAH/4AAAf4AAAB+AAAAfAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA - AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAAD4AAAB+AA - AAf4AAAf/gAAf//AA/8oAAAAIAAAAEAAAAABACAAAAAAAIAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vYg9vb2cPb29p/29va/9vb2//b29v/29vb/9vb2//b2 - 9v/29vb/9vb2//b29v/29va/9vb2n/b29nD29vYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29hD29vZw9vb23/b29v/29vb/9vb2//b29v/29vb/9vb2//b2 - 9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vbf9vb2cPb29hAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vZQ9vb27/b29v/29vb/6+vr/7Ozs/+RkZH/b29v/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9NTU3/b29v/5GRkf+zs7P/6+vr//b29v/29vb/9vb27/b2 - 9lAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2n/b29v/29vb/ycnJ/3p6ev9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/enp6/8nJ - yf/29vb/9vb2//b29p8AAAAAAAAAAAAAAAAAAAAAAAAAAPb29nD29vb/9vb2/4aGhv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/4aGhv/29vb/9vb2//b29nAAAAAAAAAAAAAAAAAAAAAA9vb23/b29v+Ghob/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/4aGhv/29vb/9vb23wAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb2 - 9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAA - AAAAAAAA9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAA - AAAAAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b2 - 9v/29vb/AAAAAAAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb2//b2 - 9v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAAAA - AAD29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAA - AAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b2 - 9v8AAAAAAAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb29v/29vb/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb2//b29v9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv/29vb/9vb2/wAAAAAAAAAAAAAAAAAAAAD29vb/9vb2/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC//b29v/29vb/AAAAAAAAAAAAAAAAAAAAAPb2 - 9v/29vb/QkJC/0JCQv9CQkL/QkJC/0JCQv95eHj/pKOk/8XExf/m5OX/8e/w//Hv8P/x7/D/8e/w//Hv - 8P/x7/D/5uTl/8XExf+ko6T/eXh4/0JCQv9CQkL/QkJC/0JCQv9CQkL/9vb2//b29v8AAAAAAAAAAAAA - AAAAAAAA9vb2//b29v9CQkL/QkJC/01NTf+amZn/5uTl//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv - 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/5uTl/5qZmf9NTU3/QkJC/0JCQv/29vb/9vb2/wAA - AAAAAAAAAAAAAAAAAAD29vb/6+vr/0JCQv9CQkL/0M/P//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv - 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/9DPz/9CQkL/QkJC//b2 - 9v/29vb/AAAAAAAAAAAAAAAAAAAAAPb29v/r6+v/QkJC/0JCQv/Qz8//8e/w//Hv8P/x7/D/8e/w//Hv - 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/0M/P/0JC - Qv9CQkL/9vb2//b29v8AAAAAAAAAAAAAAAAAAAAA9vb23/b29v+Ghob/QkJC/01NTf+amZn/5uTl//Hv - 8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w//Hv8P/x7/D/5uTl/5qZ - mf9NTU3/QkJC/4aGhv/29vb/9vb23wAAAAAAAAAAAAAAAAAAAAD29vZw9vb2/+vr6/+Ghob/QkJC/0JC - Qv9CQkL/eXh4/6SjpP/FxMX/5uTl//Hv8P/x7/D/8e/w//Hv8P/x7/D/8e/w/+bk5f/FxMX/pKOk/3l4 - eP9CQkL/QkJC/0JCQv+Ghob/6+vr//b29v/29vZwAAAAAAAAAAAAAAAAAAAAAAAAAAD29vaf9vb2//b2 - 9v/Jycn/enp6/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/QkJC/0JCQv96enr/ycnJ//b29v/29vb/9vb2nwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAD29vZQ9vb27/b29v/29vb/6+vr/7Ozs/+RkZH/b29v/0JCQv9CQkL/QkJC/0JCQv9CQkL/QkJC/0JC - Qv9CQkL/b29v/5GRkf+zs7P/6+vr//b29v/29vb/9vb27/b29lAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAD29vYQ9vb2cPb29t/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb2//b2 - 9v/29vb/9vb2//b29v/29vb/9vb2//b29v/29vb/9vb23/b29nD29vYQAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29iD29vZw9vb2n/b29r/29vb/9vb2//b2 - 9v/29vb/9vb2//b29v/29vb/9vb2//b29r/29vaf9vb2cPb29iAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAP8AAP/4AAAf8AAAD+AAAAfAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA - AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA - AAPgAAAH8AAAD/gAAB//AAD/ - - - \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb deleted file mode 100644 index 9a1b28f..0000000 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb +++ /dev/null @@ -1,299 +0,0 @@ -Imports System.Text.RegularExpressions -Imports Oracle.ManagedDataAccess.Client -Imports DD_LIB_Standards - -Public Class frmSQL_DESIGNER - - Dim CurrentPosition As Integer = 0 - Dim CurrentPlaceholders As New Placeholders() - Dim CurrentTableType As String - Dim AtPlaceholderPattern As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" '"\[%[0-9A-Za-z_-]{1,}\]" - Public Class Placeholders - Public Property RecordId As Integer - Public Property ParentRecordId As Integer - Public Property FormId As Integer - End Class - - Public Property SQLCommand() As String - Get - Return SQL_COMMANDTextBox.Text - End Get - Set(value As String) - SQL_COMMANDTextBox.Text = value - End Set - End Property - - Public Property ConnectionID As Integer - - Private Sub TBPM_PROFILE_FINAL_INDEXINGBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) - Validate() - TableAdapterManager.UpdateAll(Me.DD_DMSLiteDataSet) - End Sub - Private Sub frmSQL_FINAL_INDICES_Load(sender As Object, e As EventArgs) Handles MyBase.Load - Try - lblSaveFinalIndex.Visible = False - TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM - TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION) - If CURRENT_DESIGN_TYPE = "INPUT_INDEX" Then - CURRENT_DT_SQL_CONFIG_TABLE = DatabaseFallback.GetDatatableECM(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_UEBERPRUEFUNG,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_CONTROLS T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_CONTROL_ID)) ', "frmSQL_FINAL_INDICES_Load1") - ElseIf CURRENT_DESIGN_TYPE = "FINAL_INDEX" Then - CURRENT_DT_SQL_CONFIG_TABLE = DatabaseFallback.GetDatatableECM(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_FINAL_INDEXING T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0} ORDER BY T.SEQUENCE", CURRENT_INDEX_ID)) ', "frmSQL_FINAL_INDICES_Load2") - ElseIf CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN" Then - CURRENT_DT_SQL_CONFIG_TABLE = DatabaseFallback.GetDatatableECM(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_CONTROL_TABLE T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID)) ', "frmSQL_FINAL_INDICES_Load2") - End If - If CURRENT_DESIGN_TYPE = "SQL_OVERVIEW" Then - cmbConnection.Enabled = False - btnShowConnections.Enabled = False - Else - cmbConnection.Enabled = True - btnShowConnections.Enabled = True - End If - - If (CURRENT_DESIGN_TYPE = "INPUT_INDEX") Or CURRENT_DESIGN_TYPE = "FINAL_INDEX" Or CURRENT_DESIGN_TYPE = "SQL_BTNFINISH" Or CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN" Then - If Not IsNothing(CURRENT_DT_SQL_CONFIG_TABLE) Then - If CURRENT_DT_SQL_CONFIG_TABLE.Rows.Count = 1 Then - cmbConnection.SelectedValue = CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CONNECTION_ID") - cmbConnection.FindStringExact(CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CON_STRING")) - End If - - - End If - Dim oSQL = String.Format("SELECT NAME FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND CTRL_TYPE <> 'LBL' ORDER BY NAME", CURRENT_ProfilGUID) - Dim oDatatable As DataTable = DatabaseFallback.GetDatatableECM(oSQL) ', "frmSQL_FINAL_INDICES_Load3") - cmbControls.DataSource = oDatatable - cmbControls.DisplayMember = oDatatable.Columns(0).ColumnName - cmbControls.Visible = True - lblControls.Visible = True - btnAddControl.Visible = True - - cmbIndexe.Items.Clear() - If IDB_ACTIVE = False Then - If MyIndicies IsNot Nothing Then - For Each index As String In MyIndicies - cmbIndexe.Items.Add(index) - Next - cmbIndexe.SelectedIndex = -1 - End If - 'cmbIndexe.Enabled = True - 'lbIndexe.Enabled = True - 'btnAddIndex.Enabled = True - Else - Dim oAttributes = IDBData.GetIndicesByBE(CURRENT_OBJECTTYPE) - If oAttributes IsNot Nothing Then - For Each oAttribute As String In oAttributes - cmbIndexe.Items.Add(oAttribute) - Next - cmbIndexe.SelectedIndex = -1 - End If - - 'cmbIndexe.Enabled = False - 'lbIndexe.Enabled = False - 'btnAddIndex.Enabled = False - End If - Else - cmbControls.Visible = False - lblControls.Visible = False - btnAddControl.Visible = False - cmbIndexe.Visible = False - lbIndexe.Visible = False - btnAddIndex.Visible = False - - End If - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Unexpected Error while loading form: " & ex.Message, MsgBoxStyle.Critical) - End Try - End Sub - - Private Sub SQL_COMMANDTextBox_TextChanged(sender As Object, e As EventArgs) Handles SQL_COMMANDTextBox.TextChanged, SQL_COMMANDTextBox.Click - CurrentPosition = SQL_COMMANDTextBox.SelectionStart - - If SQL_COMMANDTextBox.Text.Trim().Count = 0 Then - dgvPlaceholders.Enabled = False - Else - dgvPlaceholders.Enabled = True - End If - - CheckForPlaceholders() - End Sub - Private Sub CheckForPlaceholders() - Dim text As String = SQL_COMMANDTextBox.Text - dgvPlaceholders.Rows.Clear() - - Dim patterns As List(Of clsPatterns.Pattern) = clsPatterns.GetAllPatterns(text) - - For Each pattern In patterns - dgvPlaceholders.Rows.Add({pattern.ToString, ""}) - Next - - 'Dim count As Integer = 0 - 'Dim text As String = Me.Value - 'Dim atPlaceholderRegex = New Regex(AtPlaceholderPattern, RegexOptions.IgnoreCase) - 'Dim matches As MatchCollection = atPlaceholderRegex.Matches(text) - 'dgvPlaceholders.Rows.Clear() - 'For Each match As Match In matches - ' dgvPlaceholders.Rows.Add({match.Value, ""}) - 'Next - End Sub - - Private Sub btnTestSQL_Click(sender As Object, e As EventArgs) Handles btnTestSQL.Click - Dim query As String = SQL_COMMANDTextBox.Text - - For Each row As DataGridViewRow In dgvPlaceholders.Rows - Dim placeholder As String = row.Cells(0).Value - Dim replacement As String = row.Cells(1).Value - - ' Wenn Ersetzung ausgefüllt wurde, Platzhalter damit ersetzen - If Not String.IsNullOrEmpty(replacement) Then - Dim pattern As New clsPatterns.Pattern(placeholder) - - query = clsPatterns.ReplacePattern(query, pattern.Type, replacement) - Else - MsgBox("Bitte geben Sie für den Platzhalter " & placeholder & " einen Wert an!", MsgBoxStyle.Exclamation, "Fehlende Platzhalter Ersetzung") - Exit Sub - End If - Next - - Dim ds As DataSet = ExecuteWithConnection(cmbConnection.SelectedValue, query) - - If ds IsNot Nothing Then - GridView1.Columns.Clear() - GridView1.PopulateColumns(ds.Tables(0)) - GridControl1.DataSource = ds.Tables(0) - End If - - End Sub - Private Function ExecuteWithConnection(connectionId As Integer, sql As String) As DataSet - Try - - Dim connectionString As String - - 'connectionString = ClassDatabase.Get_ConnectionString(connectionId) - connectionString = DatabaseFallback.GetConnectionString(connectionId) - - If connectionString <> "" Then - - If (connectionString.StartsWith("Server=") And connectionString.Contains("Database=")) Or (connectionString.StartsWith("Data Source=") And connectionString.Contains("Initial Catalog=")) Then - Dim sqlConnection As SqlClient.SqlConnection - Dim sqlCommand As SqlClient.SqlCommand - Dim sqlAdapter As New SqlClient.SqlDataAdapter - Dim dataset As New DataSet - - sqlConnection = New SqlClient.SqlConnection(connectionString) - sqlConnection.Open() - - sqlCommand = New SqlClient.SqlCommand(sql, sqlConnection) - - sqlAdapter.SelectCommand = sqlCommand - sqlAdapter.Fill(dataset) - - Return dataset - ElseIf connectionString.Contains("dsn=") Then 'ODBC-Connection - Dim sqlConnection As Odbc.OdbcConnection - Dim sqlCommand As Odbc.OdbcCommand - Dim sqlAdapter As New Odbc.OdbcDataAdapter - Dim dataset As New DataSet - - sqlConnection = New Odbc.OdbcConnection(connectionString) - sqlConnection.Open() - - sqlCommand = New Odbc.OdbcCommand(sql, sqlConnection) - - sqlAdapter.SelectCommand = sqlCommand - sqlAdapter.Fill(dataset) - - Return dataset - Else - If DEBUG = True Then LOGGER.Info(" >> It's an Oracle-Connection (ExecuteWithConnection)", False) - Dim sqlConnection As OracleConnection - Dim sqlCommand As OracleCommand - Dim sqlAdapter As New OracleDataAdapter - Dim dataset As New DataSet - - sqlConnection = New OracleConnection(connectionString) - sqlConnection.Open() - - sqlCommand = New OracleCommand(sql, sqlConnection) - - sqlAdapter.SelectCommand = sqlCommand - sqlAdapter.Fill(dataset) - - Return dataset - End If - Else - MsgBox("Keine gültige ConnectionID", MsgBoxStyle.Exclamation) - End If - - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info(" - Unvorhergesehener Fehler bei TestSQL - Fehler: " & vbNewLine & ex.Message) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei TestSQL:") - Return Nothing - End Try - End Function - - - - Private Sub btnSaveSQLCommand_Click(sender As Object, e As EventArgs) Handles btnSaveSQLCommand.Click - If CURRENT_DESIGN_TYPE = "FINAL_INDEX" Then - ' SQL wird nicht hier, sondern in frmAdministration gespeichert - lblSaveFinalIndex.Visible = True - lblSaveFinalIndex.Text = "SQL für finalen Index wurde erfolgreich gespeichert! " & Now.ToString - End If - SQLCommand = SQL_COMMANDTextBox.Text - ConnectionID = cmbConnection.SelectedValue - CURRENT_CONN_ID = ConnectionID - End Sub - - Private Sub btnAddControl_Click(sender As Object, e As EventArgs) Handles btnAddControl.Click - If cmbControls.SelectedIndex <> -1 Then - Dim value As String = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_CTRL, cmbControls.Text) - InsertAtSelection(value) - End If - End Sub - - Private Sub btnAddStatic_Click(sender As Object, e As EventArgs) Handles btnAddStatic.Click - If cmbStatic.SelectedIndex <> -1 Then - Dim value As String = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_INT, cmbStatic.Text) - InsertAtSelection(value) - End If - End Sub - - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnAddIndex.Click - If cmbIndexe.SelectedIndex <> -1 Then - Dim oValue As String - If IDB_ACTIVE = False Then - oValue = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_WMI, cmbIndexe.Text) - Else - oValue = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_IDBA, cmbIndexe.Text) - End If - - InsertAtSelection(oValue) - End If - End Sub - - Private Sub btnAddUser_Click(sender As Object, e As EventArgs) Handles btnAddUser.Click - If cmbUser.SelectedIndex <> -1 Then - Dim value As String = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_USER, cmbUser.Text) - InsertAtSelection(value) - End If - End Sub - - Private Sub InsertAtSelection(str As String) - Dim altePosition As Integer = SQL_COMMANDTextBox.SelectionStart() - SQL_COMMANDTextBox.Text = SQL_COMMANDTextBox.Text.Insert(altePosition, str) - SQL_COMMANDTextBox.SelectionStart = altePosition + str.Length - End Sub - - Private Sub btnShowConnections_Click(sender As Object, e As EventArgs) Handles btnShowConnections.Click - frmConnection.ShowDialog() - End Sub - - Private Sub cmbConnection_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbConnection.SelectedIndexChanged - - End Sub - - Private Sub Label1_Click(sender As Object, e As EventArgs) Handles Label1.Click - - End Sub -End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmSplash.vb b/app/DD_PM_WINDREAM/frmSplash.vb index 53a1a00..e73b6e7 100644 --- a/app/DD_PM_WINDREAM/frmSplash.vb +++ b/app/DD_PM_WINDREAM/frmSplash.vb @@ -87,18 +87,24 @@ Public NotInheritable Class frmSplash System.Threading.Thread.Sleep(600) bw.ReportProgress(CalcProgress(3), "Initialize Database") - If _Init.InitDatabase() = True Then - System.Threading.Thread.Sleep(600) + + Dim EDMISERV_ONLINE As Boolean = False + If EDMIService.Client Is Nothing Then + EDMISERV_ONLINE = False + Else + If EDMIService.Client.IsOnline = True Then + EDMISERV_ONLINE = True + End If + End If + + If _Init.InitDatabase(EDMISERV_ONLINE) = True Then + LOGGER.Debug("SPLASH: Database successfully intitialized!") + System.Threading.Thread.Sleep(500) bw.ReportProgress(CalcProgress(4), "Initialize UserConfiguration") _Init.InitBasics() _Init.InitUserLogin() _Init.InitBasics2() - 'System.Threading.Thread.Sleep(600) - 'bw.ReportProgress(CalcProgress(5), "Initialize windream-Settings") - 'Init.InitWindream() - - 'System.Threading.Thread.Sleep(250) End If diff --git a/app/DD_PM_WINDREAM/frmUserKonfig_AddUsers.vb b/app/DD_PM_WINDREAM/frmUserKonfig_AddUsers.vb index 54e39d6..bc5dad8 100644 --- a/app/DD_PM_WINDREAM/frmUserKonfig_AddUsers.vb +++ b/app/DD_PM_WINDREAM/frmUserKonfig_AddUsers.vb @@ -93,9 +93,9 @@ Public Class frmUserKonfig_AddUsers Dim u = group.GetMembers(True) - For Each user In u - If user.GetType().Name = "UserPrincipal" Then - users.Add(user) + For Each oUser In u + If User.GetType().Name = "UserPrincipal" Then + users.Add(oUser) End If Next @@ -107,11 +107,11 @@ Public Class frmUserKonfig_AddUsers Dim users As List(Of UserPrincipal) = GetUsersForGroup(group) DT_ADD_USERS.Clear() - For Each user In users + For Each oUser In users Dim newUserRow As DataRow = DT_ADD_USERS.NewRow Try - Dim userldap As UserPrincipal = user + Dim userldap As UserPrincipal = oUser Dim PRENAME As String = userldap.GivenName Dim NAME As String = userldap.Surname Dim USERNAME As String = userldap.SamAccountName @@ -119,7 +119,7 @@ Public Class frmUserKonfig_AddUsers newUserRow("Username") = userldap.SamAccountName Catch ex As Exception LOGGER.Error(ex) - newUserRow("Username") = user.ToString + newUserRow("Username") = User.ToString End Try Dim email As String = userldap.EmailAddress newUserRow("Prename") = PRENAME diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index 253e7cf..8a17e31 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -96,10 +96,10 @@ Partial Class frmValidator Me.RepositoryItemComboBox3 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.btnitemConversation_reload = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItemAttmt = New DevExpress.XtraBars.BarButtonItem() + Me.Attmt_bbtnitmShow = New DevExpress.XtraBars.BarButtonItem() Me.barbtnitmExport = New DevExpress.XtraBars.BarButtonItem() Me.ToggleSwitchItemLoadonClick = New DevExpress.XtraBars.BarToggleSwitchItem() - Me.BarCheckItemLoadOnClick = New DevExpress.XtraBars.BarCheckItem() + Me.Attmnt_bbtnitm_LoadonClick = New DevExpress.XtraBars.BarCheckItem() Me.RibbonPageConversations = New DevExpress.XtraBars.Ribbon.RibbonPageCategory() Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroupConv1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -464,7 +464,7 @@ Partial Class frmValidator 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem2, Me.BarLinkContainerItem1, Me.btnitemConversationEnd, Me.bbtnitem_ConversationNew, Me.BarLinkContainerItem2, Me.BarEditItem1, Me.BarEditItem2, Me.BarEditItem3, Me.btnitemConversation_reload, Me.BarButtonItem5, Me.BarButtonItemAttmt, Me.barbtnitmExport, Me.ToggleSwitchItemLoadonClick, Me.BarCheckItemLoadOnClick}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem2, Me.BarLinkContainerItem1, Me.btnitemConversationEnd, Me.bbtnitem_ConversationNew, Me.BarLinkContainerItem2, Me.BarEditItem1, Me.BarEditItem2, Me.BarEditItem3, Me.btnitemConversation_reload, Me.BarButtonItem5, Me.Attmt_bbtnitmShow, Me.barbtnitmExport, Me.ToggleSwitchItemLoadonClick, Me.Attmnt_bbtnitm_LoadonClick}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 32 Me.RibbonControl1.Name = "RibbonControl1" @@ -684,13 +684,13 @@ Partial Class frmValidator Me.BarButtonItem5.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem5.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem5.Name = "BarButtonItem5" ' - 'BarButtonItemAttmt + 'Attmt_bbtnitmShow ' - resources.ApplyResources(Me.BarButtonItemAttmt, "BarButtonItemAttmt") - Me.BarButtonItemAttmt.Id = 27 - Me.BarButtonItemAttmt.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemAttmt.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItemAttmt.Name = "BarButtonItemAttmt" - Me.BarButtonItemAttmt.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + resources.ApplyResources(Me.Attmt_bbtnitmShow, "Attmt_bbtnitmShow") + Me.Attmt_bbtnitmShow.Id = 27 + Me.Attmt_bbtnitmShow.ImageOptions.SvgImage = CType(resources.GetObject("Attmt_bbtnitmShow.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.Attmt_bbtnitmShow.Name = "Attmt_bbtnitmShow" + Me.Attmt_bbtnitmShow.Visibility = DevExpress.XtraBars.BarItemVisibility.Never ' 'barbtnitmExport ' @@ -707,20 +707,20 @@ Partial Class frmValidator Me.ToggleSwitchItemLoadonClick.ImageOptions.SvgImage = CType(resources.GetObject("ToggleSwitchItemLoadonClick.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.ToggleSwitchItemLoadonClick.Name = "ToggleSwitchItemLoadonClick" ' - 'BarCheckItemLoadOnClick + 'Attmnt_bbtnitm_LoadonClick ' - resources.ApplyResources(Me.BarCheckItemLoadOnClick, "BarCheckItemLoadOnClick") - Me.BarCheckItemLoadOnClick.Id = 31 - Me.BarCheckItemLoadOnClick.ImageOptions.SvgImage = CType(resources.GetObject("BarCheckItemLoadOnClick.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarCheckItemLoadOnClick.ItemAppearance.Pressed.Font = CType(resources.GetObject("BarCheckItemLoadOnClick.ItemAppearance.Pressed.Font"), System.Drawing.Font) - Me.BarCheckItemLoadOnClick.ItemAppearance.Pressed.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Information - Me.BarCheckItemLoadOnClick.ItemAppearance.Pressed.Options.UseFont = True - Me.BarCheckItemLoadOnClick.ItemAppearance.Pressed.Options.UseForeColor = True - Me.BarCheckItemLoadOnClick.ItemInMenuAppearance.Pressed.Font = CType(resources.GetObject("BarCheckItemLoadOnClick.ItemInMenuAppearance.Pressed.Font"), System.Drawing.Font) - Me.BarCheckItemLoadOnClick.ItemInMenuAppearance.Pressed.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Information - Me.BarCheckItemLoadOnClick.ItemInMenuAppearance.Pressed.Options.UseFont = True - Me.BarCheckItemLoadOnClick.ItemInMenuAppearance.Pressed.Options.UseForeColor = True - Me.BarCheckItemLoadOnClick.Name = "BarCheckItemLoadOnClick" + resources.ApplyResources(Me.Attmnt_bbtnitm_LoadonClick, "Attmnt_bbtnitm_LoadonClick") + Me.Attmnt_bbtnitm_LoadonClick.Id = 31 + Me.Attmnt_bbtnitm_LoadonClick.ImageOptions.SvgImage = CType(resources.GetObject("Attmnt_bbtnitm_LoadonClick.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.Attmnt_bbtnitm_LoadonClick.ItemAppearance.Pressed.Font = CType(resources.GetObject("Attmnt_bbtnitm_LoadonClick.ItemAppearance.Pressed.Font"), System.Drawing.Font) + Me.Attmnt_bbtnitm_LoadonClick.ItemAppearance.Pressed.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Information + Me.Attmnt_bbtnitm_LoadonClick.ItemAppearance.Pressed.Options.UseFont = True + Me.Attmnt_bbtnitm_LoadonClick.ItemAppearance.Pressed.Options.UseForeColor = True + Me.Attmnt_bbtnitm_LoadonClick.ItemInMenuAppearance.Pressed.Font = CType(resources.GetObject("Attmnt_bbtnitm_LoadonClick.ItemInMenuAppearance.Pressed.Font"), System.Drawing.Font) + Me.Attmnt_bbtnitm_LoadonClick.ItemInMenuAppearance.Pressed.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Information + Me.Attmnt_bbtnitm_LoadonClick.ItemInMenuAppearance.Pressed.Options.UseFont = True + Me.Attmnt_bbtnitm_LoadonClick.ItemInMenuAppearance.Pressed.Options.UseForeColor = True + Me.Attmnt_bbtnitm_LoadonClick.Name = "Attmnt_bbtnitm_LoadonClick" ' 'RibbonPageConversations ' @@ -776,8 +776,8 @@ Partial Class frmValidator 'RibbonPageCustAttmt ' Me.RibbonPageCustAttmt.AllowTextClipping = False - Me.RibbonPageCustAttmt.ItemLinks.Add(Me.BarButtonItemAttmt) - Me.RibbonPageCustAttmt.ItemLinks.Add(Me.BarCheckItemLoadOnClick) + Me.RibbonPageCustAttmt.ItemLinks.Add(Me.Attmt_bbtnitmShow) + Me.RibbonPageCustAttmt.ItemLinks.Add(Me.Attmnt_bbtnitm_LoadonClick) Me.RibbonPageCustAttmt.ItemLinks.Add(Me.barbtnitmExport) Me.RibbonPageCustAttmt.Name = "RibbonPageCustAttmt" resources.ApplyResources(Me.RibbonPageCustAttmt, "RibbonPageCustAttmt") @@ -932,10 +932,10 @@ Partial Class frmValidator Friend WithEvents ChatControl1 As DigitalData.Controls.ChatControl.ChatControl Friend WithEvents btnitemConversation_reload As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents BarButtonItemAttmt As DevExpress.XtraBars.BarButtonItem + Friend WithEvents Attmt_bbtnitmShow As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageCustAttmt As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents barbtnitmExport As DevExpress.XtraBars.BarButtonItem Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog Friend WithEvents ToggleSwitchItemLoadonClick As DevExpress.XtraBars.BarToggleSwitchItem - Friend WithEvents BarCheckItemLoadOnClick As DevExpress.XtraBars.BarCheckItem + Friend WithEvents Attmnt_bbtnitm_LoadonClick As DevExpress.XtraBars.BarCheckItem End Class diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index 04eec85..4f01899 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -319,7 +319,7 @@ DocumentViewerValidator - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.8.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.7.0.1, Culture=neutral, PublicKeyToken=null SplitContainer1.Panel2 @@ -932,10 +932,10 @@ ayIgLz4NCjwvc3ZnPgs= - + Anhänge - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -999,10 +999,10 @@ Ny0zLjEsNy03VjEwSDIyeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L - + Suche nur auf Click laden - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -1020,10 +1020,10 @@ ZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L - + Tahoma, 8.25pt, style=Bold - + Tahoma, 8.25pt, style=Bold @@ -1048,7 +1048,7 @@ Aktionen - Custom PageGroup + Anhänge zu Beleg @@ -1672,10 +1672,10 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItemAttmt + + Attmt_bbtnitmShow - + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -1690,10 +1690,10 @@ DevExpress.XtraBars.BarToggleSwitchItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarCheckItemLoadOnClick + + Attmnt_bbtnitm_LoadonClick - + DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 53ce5bf..2066783 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -11,8 +11,13 @@ Imports DigitalData.Modules.Language.Utils Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback Imports DigitalData.Modules.EDMI.API.Constants Imports DevExpress.XtraBars +Imports DigitalData.GUIs.Common.DocumentResultList +Imports DigitalData.Modules.ZooFlow +Imports DigitalData.Modules.ZooFlow.Constants +Imports DigitalData.GUIs.Common Public Class frmValidator + Private Property Current_Document As DocumentResultList.Document = Nothing ''' ''' Contains all controls for the current profile ''' @@ -73,8 +78,6 @@ Public Class frmValidator Private Property _dependingColumn_in_action As Boolean = False Private Property _SetControlValue_in_action As Boolean = False - - Private Property DTConversations As DataTable Private Property DTDYNAMIC_RIGHTS As DataTable @@ -96,25 +99,56 @@ Public Class frmValidator Private Property listChangedLookup As New List(Of String) Private Property ControlHandleStarted As Boolean = False + Private Documentloader As Loader + Private Property OperationMode As OperationMode + Private ReadOnly Environment As Environment + Private AdditionalDocResultsExist As Boolean = False - Public Sub New() + + Public Sub New(pEnvironment As Environment) 'MyBase.New LOGGER.Debug("Initialize Components...") InitializeComponent() - LOGGER.Debug("Initialize _frmValidatorSearch...") + Environment = pEnvironment + Try - _frmValidatorSearch = New frmValidatorSearch + LOGGER.Debug("Initialize _frmValidatorSearch...") + _frmValidatorSearch = New frmValidatorSearch(Me, Environment) Catch ex As Exception LOGGER.Error(ex) End Try End Sub + Private Function GetOperationMode() As OperationMode + Dim oOperationMode As OperationMode + + If Environment.Service.Client Is Nothing Then + Return OperationMode.NoAppServer + + End If + If Environment.Service.Client.IsOnline AndAlso Environment.Service.Client.ServerAddress <> String.Empty And IDB_USES_WMFILESTORE = False Then + oOperationMode = OperationMode.WithAppServer + Else + oOperationMode = OperationMode.NoAppServer + End If + If OPERATION_MODE_FS = ClassConstants.OpModeFS_ZF Then + oOperationMode = OperationMode.ZooFlow + End If + + Return oOperationMode + End Function + Private Sub frmValidation_Load(sender As Object, e As System.EventArgs) Handles Me.Load Try LOGGER.Debug("###frmValidation_Load###") - 'DataASorDB = New ClassDataASorDB + ' Operation mode is either guessed from service settings + ' or explictly set from OperationModeOverride in Params + OperationMode = GetOperationMode() + + Documentloader = New Loader(LOGCONFIG, OperationMode, Environment.Service.Client, Environment.User) + PMDelimiter = "~" Override = False @@ -127,8 +161,9 @@ Public Class frmValidator 'pdfxchange = False 'sumatra = False FormLoaded = False - BarButtonItemAttmt.Visibility = BarItemVisibility.Never - BarCheckItemLoadOnClick.Visibility = BarItemVisibility.Never + Attmt_bbtnitmShow.Visibility = BarItemVisibility.Never + Attmnt_bbtnitm_LoadonClick.Visibility = BarItemVisibility.Never + Catch ex As Exception LOGGER.Warn($"Error in frmValidation_load1: {ex.Message}") End Try @@ -504,26 +539,21 @@ Public Class frmValidator End If End Function Public Function Test_Additional_Doc_Searches_Exist() As Boolean - If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then + If DT_FILTERED_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then Dim oDocResultCommand As String Dim oDatatableDocResult As DataTable = Nothing - If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then - 'Check whether DocData is there - Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID") - oDocResultCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") - oDocResultCommand = clsPatterns.ReplaceAllValues(oDocResultCommand, PanelValidatorControl, True) - oDatatableDocResult = DatabaseFallback.GetDatatableWithConnection(oDocResultCommand, oConID) - End If + 'Check whether DocData is there + Dim oConID = DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID") + oDocResultCommand = DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") + oDocResultCommand = clsPatterns.ReplaceAllValues(oDocResultCommand, PanelValidatorControl, True) + oDatatableDocResult = DatabaseFallback.GetDatatableWithConnection(oDocResultCommand, oConID) Dim oDocResultsExist As Boolean = False - - If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then - If Not IsNothing(oDatatableDocResult) Then - If oDatatableDocResult.Rows.Count > 0 Then - oDocResultsExist = True - DT_AdditionalSearches_Resultset_Docs = oDatatableDocResult - End If + If Not IsNothing(oDatatableDocResult) Then + If oDatatableDocResult.Rows.Count > 0 Then + oDocResultsExist = True + DT_AdditionalSearches_Resultset_Docs = oDatatableDocResult End If End If @@ -535,16 +565,12 @@ Public Class frmValidator Public Sub Load_Additional_Searches() Try - Dim oDocResultsExist = Test_Additional_Doc_Searches_Exist() + AdditionalDocResultsExist = Test_Additional_Doc_Searches_Exist() Dim oDataResultsExist = Test_Additional_Data_Searches_Exist() 'If Test_Additional_Searches_Exist() Then - If oDataResultsExist = True Or oDocResultsExist = True Then - RibbonPageCustAttmt.Visible = True + If oDataResultsExist = True Or AdditionalDocResultsExist = True Then Try - 'If CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK = False Then - '_frmValidatorSearch.Show() - 'End If Dim oPnl1Collapsed As Boolean = True Dim oPnl2Collapsed As Boolean = True @@ -553,34 +579,30 @@ Public Class frmValidator Else oPnl1Collapsed = True End If - If oDocResultsExist = True Then - oPnl2Collapsed = False - Else - oPnl2Collapsed = True - End If - _frmValidatorSearch.TabPreload(oPnl1Collapsed, oPnl2Collapsed, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count, - BASEDATA_DT_PROFILE_SEARCHES_SQL, BASEDATA_DT_PROFILE_SEARCHES_DOC) - If oDocResultsExist Then - _frmValidatorSearch._DTDocSearches = BASEDATA_DT_PROFILE_SEARCHES_DOC - Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID") - Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") + oPnl2Collapsed = False + Dim oConID As Int16 + Dim oCommand As String + Attmnt_bbtnitm_LoadonClick.Visibility = BarItemVisibility.Always + Attmt_bbtnitmShow.Visibility = BarItemVisibility.Always + If AdditionalDocResultsExist Then + + _frmValidatorSearch.TabPreload(oPnl1Collapsed, oPnl2Collapsed, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count, DT_FILTERED_PROFILE_SEARCHES_DOC.Rows.Count, + BASEDATA_DT_PROFILE_SEARCHES_SQL, DT_FILTERED_PROFILE_SEARCHES_DOC) + _frmValidatorSearch._DTDocSearches = DT_FILTERED_PROFILE_SEARCHES_DOC + oConID = DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID") + oCommand = DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") oCommand = clsPatterns.ReplaceAllValues(oCommand, PanelValidatorControl, True) - 'RibbonPageCustAttmt.Visible = True - _frmValidatorSearch.RefreshTabDoc(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE")) - Else - RibbonPageCustAttmt.Visible = False + _frmValidatorSearch.RefreshTabDoc(oConID, oCommand, 0, DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE")) End If If oDataResultsExist Then _frmValidatorSearch._DTSQLSearches = BASEDATA_DT_PROFILE_SEARCHES_SQL - Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID") - Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND") + oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID") + oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND") oCommand = clsPatterns.ReplaceAllValues(oCommand, PanelValidatorControl, True) - 'RibbonPageCustAttmt.Visible = True _frmValidatorSearch.Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE")) - End If Catch ex As Exception @@ -588,8 +610,11 @@ Public Class frmValidator End Try bbtniRefreshSearches.Visibility = BarItemVisibility.Always + RibbonPageCustAttmt.Visible = True Else bbtniRefreshSearches.Visibility = BarItemVisibility.Never + Attmnt_bbtnitm_LoadonClick.Visibility = BarItemVisibility.Never + Attmt_bbtnitmShow.Visibility = BarItemVisibility.Never RibbonPageCustAttmt.Visible = False LOGGER.Debug("Not loading AdditionalSearches 1...!") End If @@ -2320,6 +2345,7 @@ Public Class frmValidator Try Amount_Docs2Validate = oDT.Rows(0).Item(2) Catch ex As Exception + Amount_Docs2Validate = 0 LOGGER.Warn("Amount_Docs2Validate Error: " & ex.Message) End Try @@ -2390,7 +2416,7 @@ Public Class frmValidator LOGGER.Debug($"Checking file 0 [{oResult}] exists?...") WMDocPathWindows = String.Empty - If File.Exists(oResult) = False Then + If File.Exists(oResult) = False And OPERATION_MODE_FS <> ClassConstants.OpModeFS_ZF Then DocPathWindows = oResult LOGGER.Info($"GetWMDocPathWindows returned false [{oResult}] - trying with standard again...") oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)" @@ -2428,6 +2454,7 @@ Public Class frmValidator oSQl = oSQl.Replace("@DOC_GUID", CURRENT_DOC_GUID) oSQl = oSQl.Replace("@DOC_ID", CURRENT_DOC_ID) oSQl = oSQl.Replace("@DocID", CURRENT_DOC_ID) + LOGGER.Debug($"Load_IDB_DOC_DATA SQL: {oSQl}") IDB_DT_DOC_DATA = DatabaseFallback.GetDatatableECM(oSQl) Catch ex As Exception LOGGER.Error(ex) @@ -2475,9 +2502,9 @@ Public Class frmValidator ElseIf first = False Then CURRENT_DOC_GUID = 0 End If - LOGGER.Debug("Dokument-GUID: '" & CURRENT_DOC_GUID.ToString & "'") + LOGGER.Info("LoadNextDocument - Dokument-GUID: '" & CURRENT_DOC_GUID.ToString & "'") If CURRENT_DOC_GUID > 0 Then - If GetDocPathWindows(0) = False Then + If (OPERATION_MODE_FS = ClassConstants.OpModeFS_PWM Or OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM) And GetDocPathWindows(0) = False Then SetStatusLabel($"File not accessable: {DocPathWindows}", "DarkOrange") MsgBox("The file can not be diplayed or is not accessable!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) End If @@ -2487,20 +2514,26 @@ Public Class frmValidator End If Else Load_IDB_DOC_DATA() - If IDB_DT_DOC_DATA.Rows.Count = 1 Then - LOGGER.Debug("Got one IDB DocData Result") + If IsNothing(IDB_DT_DOC_DATA) Then + LOGGER.Warn("ATTENTION: IDB-Data is nothing. Check the IDB_DOC_DATA_SQL Variable Source") + Exit Sub + Else + If IDB_DT_DOC_DATA.Rows.Count = 1 Then + LOGGER.Debug("Got one IDB DocData Result") + End If End If End If - 'Beschriftung des Navigators - 'lblNavigator_anzDok.Text = position & " of " & Anzahl_ValDoks & " files" - 'If WMDocPathWindows <> String.Empty Then - ' >> >> >> >> >> >>##### Das Dokument in Bearbeitung nehmen ########################### - Dim sql = $"UPDATE TBPM_PROFILE_FILES SET IN_WORK = 1, IN_WORK_WHEN = GETDATE(), WORK_USER = '{USER_USERNAME}' WHERE GUID = {CURRENT_DOC_GUID}" - DatabaseFallback.ExecuteNonQueryECM(sql) + + 'Beschriftung des Navigators + 'lblNavigator_anzDok.Text = position & " Of " & Anzahl_ValDoks & " files" + 'If WMDocPathWindows <> String.Empty Then + ' >> >> >> >> >> >>##### Das Dokument in Bearbeitung nehmen ########################### + Dim sql = $"UPDATE TBPM_PROFILE_FILES Set IN_WORK = 1, IN_WORK_WHEN = GETDATE(), WORK_USER = '{USER_USERNAME}' WHERE GUID = {CURRENT_DOC_GUID}" + DatabaseFallback.ExecuteNonQueryECM(Sql) ' ############ Infos eintragen ################# - ' txtDateipfad.Text = Document_Path - Dim omsg = $"Verbleibende Belege: {Amount_Docs2Validate}" + ' txtDateipfad.Text = Document_Path + Dim omsg = $"Verbleibende Belege: {Amount_Docs2Validate}" If USER_LANGUAGE <> "de-DE" Then omsg = $"Remaining documents: {omsg}" End If @@ -2517,10 +2550,10 @@ Public Class frmValidator If oErrMsgMissingInput = "" Then - If WMDocPathWindows <> String.Empty Then + If WMDocPathWindows <> String.Empty Or OPERATION_MODE_FS = ClassConstants.OpModeFS_ZF Then load_viewer() LOGGER.Debug("Viewer loaded!") - If WMDocPathWindows.ToLower.EndsWith(".pdf") = False Then + If Current_Document.Extension <> "pdf" Then bbtniAnnotation.Visibility = BarItemVisibility.Never End If End If @@ -2606,7 +2639,27 @@ Public Class frmValidator End Try End Sub Sub load_viewer() - DocumentViewerValidator.LoadFile(WMDocPathWindows) + ' DocumentViewerValidator.LoadFile(WMDocPathWindows) + + Try + Dim oDocument As DocumentResultList.Document = Nothing + ' Load DocumentInfo + oDocument = Documentloader.Load(CURRENT_DOC_ID, WMDocPathWindows) + If oDocument Is Nothing Then + Exit Sub + End If + Current_Document = oDocument + Catch ex As Exception + LOGGER.Error(ex) + Exit Sub + End Try + + + ' Load Document in Document Viewer + Dim oFileName = $"{CURRENT_DOC_ID}.{Current_Document.Extension}" + DocumentViewerValidator.LoadFile(oFileName, New MemoryStream(Current_Document.Contents)) + + DocumentViewerValidator.RightOnlyView(USER_RIGHT_VIEW_ONLY) 'war auskommentiert.....WARUM? If USER_RIGHT_VIEW_ONLY = True Then RibbonPageFile.Visible = False @@ -3625,13 +3678,13 @@ Public Class frmValidator ' Should the custom Ribbon group be displayed at all? ' Will be hidden later if not search results are found If RibbonPageCustItm1 <> "" Then - BarButtonItemAttmt.Caption = RibbonPageCustItm1 - BarButtonItemAttmt.Visibility = BarItemVisibility.Always - BarCheckItemLoadOnClick.Checked = CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK - BarCheckItemLoadOnClick.Visibility = BarItemVisibility.Always + Attmt_bbtnitmShow.Caption = RibbonPageCustItm1 + Attmt_bbtnitmShow.Visibility = BarItemVisibility.Always + Attmnt_bbtnitm_LoadonClick.Checked = CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK + Attmnt_bbtnitm_LoadonClick.Visibility = BarItemVisibility.Always Else - BarButtonItemAttmt.Visibility = BarItemVisibility.Never - BarCheckItemLoadOnClick.Visibility = BarItemVisibility.Never + Attmt_bbtnitmShow.Visibility = BarItemVisibility.Never + Attmnt_bbtnitm_LoadonClick.Visibility = BarItemVisibility.Never End If Load_Additional_Searches() ' If Searches should be loaded automatically, not only on click @@ -3684,7 +3737,6 @@ Public Class frmValidator Try If RibbonPageCustTitle <> "" Then RibbonPageCustAttmt.Text = RibbonPageCustTitle - End If If Not IsNothing(WMDocPathWindows) Then If ButtonExport2Folder_Caption <> "" And WMDocPathWindows <> "" Then @@ -4110,11 +4162,11 @@ Public Class frmValidator WORK_HISTORY_ENTRY = "" End If End If - Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, USER_USERNAME, Environment.MachineName, WORK_HISTORY_ENTRY) + Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, USER_USERNAME, System.Environment.MachineName, WORK_HISTORY_ENTRY) DatabaseFallback.ExecuteNonQueryECM(ins) Dim oFIsql As String 'Close_document_viewer() - If WMDocPathWindows.ToLower.EndsWith(".pdf") Then + If Current_Document.Extension = "pdf" Then If Not IsNothing(WORK_HISTORY_ENTRY) Then If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then oFIsql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE GUID = (SELECT MAX(GUID) FROM TBPM_FILES_WORK_HISTORY WHERE PROFIL_ID = {0} AND DOC_ID = {1})", CURRENT_ProfilGUID, CURRENT_DOC_ID) @@ -4144,7 +4196,7 @@ Public Class frmValidator End If 'wenn Move2Folder aktiviert wurde - If Move2Folder <> "" Then + If Move2Folder <> "" And (OPERATION_MODE_FS = ClassConstants.OpModeFS_PWM Or OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM) Then idxerr_message = allgFunk.Move2Folder(WMDocPathWindows, Move2Folder, CURRENT_ProfilGUID, WINDREAM_ALLG) If idxerr_message <> "" Then errormessage = "Fehler bei Move2Folder:" & vbNewLine & idxerr_message @@ -4154,9 +4206,7 @@ Public Class frmValidator ItemWorked = False End If End If - 'Validierungsfile löschen wenn vorhanden - 'allgFunk.Delete_xffres(WMDocPathWindows, _windream) - 'LOGGER.Debug("Delete_xffres ausgeführt") + End If @@ -4787,7 +4837,7 @@ Public Class frmValidator Else oObjectValue = GetVariableValuefromSource(oIndexName, oIDBTyp) End If - If IsNothing(oObjectValue) Then + If IsNothing(oObjectValue) Or IsDBNull(oObjectValue) Then oObjectValue = CDate("01.01.1900") End If 'wenn Wert in Windream <> der Eingabe darf indexiert werden @@ -4815,7 +4865,7 @@ Public Class frmValidator Exit For End If Else - If IDBData.SetVariableValue(oIndexName, oObjectValue) = False Then + If IDBData.SetVariableValue(oIndexName, oMyInput) = False Then oMissing = True oErrMsgMissingInput = "Error indexing datepicker idb" LOGGER.Warn(oErrMsgMissingInput) @@ -5500,7 +5550,7 @@ Public Class frmValidator Sub Click_Additional_Searches() Try _frmValidatorSearch?.Close() - _frmValidatorSearch = New frmValidatorSearch + _frmValidatorSearch = New frmValidatorSearch(Me, Environment) _frmValidatorSearch.Show() Catch ex As Exception LOGGER.Error(ex) @@ -5556,7 +5606,7 @@ Public Class frmValidator If Check_UpdateIndexe() = True Then SetStatusLabel($"Data saved", "LimeGreen") LOGGER.Info("Workflowdata saved manually!") - Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, USER_USERNAME, Environment.MachineName, "Manual Save via button") + Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, USER_USERNAME, System.Environment.MachineName, "Manual Save via button") DatabaseFallback.ExecuteNonQueryECM(ins) Else SetStatusLabel($"Error while saving data!", "Red") @@ -5697,7 +5747,7 @@ Public Class frmValidator MsgBox("Versioning not configured! (Reasons: RightManagement, Displaying)", MsgBoxStyle.Information) End Sub - Private Sub BarButtonItem6_ItemClick_1(sender As Object, e As ItemClickEventArgs) Handles BarButtonItemAttmt.ItemClick + Private Sub BarButtonItem6_ItemClick_1(sender As Object, e As ItemClickEventArgs) Handles Attmt_bbtnitmShow.ItemClick Click_Additional_Searches() End Sub @@ -5758,11 +5808,11 @@ Public Class frmValidator - Private Sub BarCheckItemLoadOnClick_CheckedChanged(sender As Object, e As ItemClickEventArgs) Handles BarCheckItemLoadOnClick.CheckedChanged + Private Sub BarCheckItemLoadOnClick_CheckedChanged(sender As Object, e As ItemClickEventArgs) Handles Attmnt_bbtnitm_LoadonClick.CheckedChanged If FormLoaded = False Then Exit Sub End If - CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK = BarCheckItemLoadOnClick.Checked + CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK = Attmnt_bbtnitm_LoadonClick.Checked CONFIG.Save() End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidatorSearch.Designer.vb b/app/DD_PM_WINDREAM/frmValidatorSearch.Designer.vb index f108c20..939f1d9 100644 --- a/app/DD_PM_WINDREAM/frmValidatorSearch.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidatorSearch.Designer.vb @@ -85,6 +85,10 @@ Partial Class frmValidatorSearch Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem() CType(Me.SplitContainerControlDoc, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControlDoc.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControlDoc.Panel1.SuspendLayout() + CType(Me.SplitContainerControlDoc.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControlDoc.Panel2.SuspendLayout() Me.SplitContainerControlDoc.SuspendLayout() CType(Me.XtraTabControlDocs, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControlDocs.SuspendLayout() @@ -135,8 +139,14 @@ Partial Class frmValidatorSearch ' resources.ApplyResources(Me.SplitContainerControlDoc, "SplitContainerControlDoc") Me.SplitContainerControlDoc.Name = "SplitContainerControlDoc" + ' + 'SplitContainerControlDoc.Panel1 + ' resources.ApplyResources(Me.SplitContainerControlDoc.Panel1, "SplitContainerControlDoc.Panel1") Me.SplitContainerControlDoc.Panel1.Controls.Add(Me.XtraTabControlDocs) + ' + 'SplitContainerControlDoc.Panel2 + ' resources.ApplyResources(Me.SplitContainerControlDoc.Panel2, "SplitContainerControlDoc.Panel2") Me.SplitContainerControlDoc.Panel2.Controls.Add(Me.DocumentViewer1) Me.SplitContainerControlDoc.SplitterPosition = 351 @@ -739,6 +749,10 @@ Partial Class frmValidatorSearch Me.Controls.Add(Me.ToolStrip1) Me.MinimizeBox = False Me.Name = "frmValidatorSearch" + CType(Me.SplitContainerControlDoc.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControlDoc.Panel1.ResumeLayout(False) + CType(Me.SplitContainerControlDoc.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControlDoc.Panel2.ResumeLayout(False) CType(Me.SplitContainerControlDoc, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControlDoc.ResumeLayout(False) CType(Me.XtraTabControlDocs, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/app/DD_PM_WINDREAM/frmValidatorSearch.en-US.resx b/app/DD_PM_WINDREAM/frmValidatorSearch.en-US.resx index e585193..a37d25d 100644 --- a/app/DD_PM_WINDREAM/frmValidatorSearch.en-US.resx +++ b/app/DD_PM_WINDREAM/frmValidatorSearch.en-US.resx @@ -117,371 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - - - - - - Default - - - Top, Left - - - - - - Tile - - - Inherit - - - 0, 0 - - - - Center - - - - - - - None - - - - - - - - - - - - Default - - - Top, Left - - - - - - Tile - - - Inherit - - - 0, 0 - - - Center - - - - - - None - - - - - - - - - - - - Default - - - Top, Left - - - - - - Tile - - - Inherit - - - 0, 0 - - - Center - - - - - - None - - - - - - - - - - - - Default - - - Top, Left - - - - - - Tile - - - Inherit - - - 0, 0 - - - Center - - - - - - None - - - - - - - - - - - - Default - - - Top, Left - - - - - - Tile - - - Inherit - - - 0, 0 - - - Center - - - - - - None - - - - - - - - - - - - Default - - - Top, Left - - - - - - Tile - - - Inherit - - - 0, 0 - - - Center - - - - - - None - - - - - - - - - - - - Default - - - Top, Left - - - - - - Tile - - - Inherit - - - 0, 0 - - - Center - - - - - - None - - - - - - - - - - - - Default - - - Top, Left - - - - - - Tile - - - Inherit - - - 0, 0 - - - Center - - - - - - None - - - - - - - - - - - - Default - - - Top, Left - - - - - - Tile - - - Inherit - - - 0, 0 - - - Center - - - - - - None - - - - - - - - - - - - Default - - - Top, Left - - - - - - Tile - - - Inherit - - - 0, 0 - - - Center - - - - - - None - - - - 115, 22 diff --git a/app/DD_PM_WINDREAM/frmValidatorSearch.resx b/app/DD_PM_WINDREAM/frmValidatorSearch.resx index 17b45de..befa5aa 100644 --- a/app/DD_PM_WINDREAM/frmValidatorSearch.resx +++ b/app/DD_PM_WINDREAM/frmValidatorSearch.resx @@ -126,59 +126,57 @@ XtraTabPageDoc4 - - - 0 + + - - SplitContainerSearches.Panel2 + + + None - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - GridControlDocSearch5 + + + 0, 0 XtraTabPageDoc1 - - - - - - - GridControlSearch2 + + + Top, Left + Eigenschaften DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 2 + + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.7.0.1, Culture=neutral, PublicKeyToken=null + + + 0, 0 System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + - - ContextMenuStripWMFile + + 0, 0 Center - - ToolStrip1 + + GridControlSearch1 @@ -189,7 +187,6 @@ 0 - 0, 0 @@ -199,8 +196,8 @@ 143, 32 - - XtraTabPage3 + + 91, 17 @@ -281,13 +278,13 @@ NCptKjDqzVry2yqzA0rjAWR6W+0nUAO1/HuxaLC+AebHD8Ec7JqWAAAAAElFTkSuQmCC - None System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 3 @@ -300,9 +297,6 @@ 131, 22 - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -315,8 +309,8 @@ 2 - - 349, 557 + + 0, 582 @@ -360,9 +354,6 @@ Zusätzliche Suchen - - Tile - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -378,10 +369,10 @@ 6 - - 181, 22 + + GridControlDocSearch5 - + @@ -390,10 +381,13 @@ XtraTabPage2 + + System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + No action so far - + @@ -426,6 +420,12 @@ XtraTabPageDoc5 + + + + + XtraTabControlDocs + Öffnen @@ -444,21 +444,24 @@ System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 + 1 1 + + Default + 0, 0 349, 557 - - Tile - 0, 0 @@ -486,6 +489,9 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + XtraTabPageDoc3 @@ -504,9 +510,15 @@ StatusStrip1 + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + 561, 560 + + 561, 560 + Fill @@ -516,8 +528,8 @@ 3 - - 1 + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a Fill @@ -534,6 +546,9 @@ 561, 560 + + GridControlDocSearch4 + Inherit @@ -543,17 +558,14 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Inherit - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridViewSearch4 - - 1 + + Tile 1 @@ -561,9 +573,6 @@ XtraTabPageDoc5 - - Tile - Search2 @@ -576,33 +585,27 @@ DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - None - Tile 349, 557 - - - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 0, 0 - - Fill + + + + + Center GridViewSearch5 - - - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -630,6 +633,9 @@ 2 + + SplitContainerControlDoc.Panel2 + SplitContainerSearches @@ -651,8 +657,8 @@ 0 - - SplitContainerSearches.Panel2 + + 1 @@ -663,9 +669,6 @@ 0, 0 - - - 1 @@ -720,9 +723,6 @@ Magenta - - GridControlDocSearch3 - 181, 22 @@ -747,6 +747,9 @@ Top, Left + + SplitContainerControlDoc + 0, 0 @@ -759,12 +762,15 @@ 0, 0 - - XtraTabControlDocs + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 181, 22 + 349, 557 @@ -783,8 +789,8 @@ Inherit - - + + SplitContainerSearches.Panel2 XtraTabPageSearch5 @@ -792,14 +798,11 @@ Bottom - - - XtraTabControlDocs - - XtraTabControlSQL + + 0, 0 DateiÖffnenToolStripMenuItem1 @@ -810,8 +813,8 @@ SplitContainerSearches - - + + 0, 0 @@ -825,15 +828,9 @@ XtraTabPageSearch4 - - - 0 - - Center - None @@ -846,6 +843,9 @@ DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 1 + XtraTabControlDocs @@ -855,18 +855,12 @@ DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 0, 0 - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.3.0, Culture=neutral, PublicKeyToken=null - SplitContainerSearches @@ -906,8 +900,8 @@ GridControlSearch4 - - GridViewSearch3 + + XtraTabControlDocs Datei öffnen @@ -915,6 +909,9 @@ XtraTabPageDoc4 + + 182, 98 + GridControlSearch5 @@ -933,8 +930,8 @@ 0, 25 - - Top, Left + + 2 ToolStripMenuItem4 @@ -942,17 +939,14 @@ None - - 561, 560 - Datei 0 - - 181, 22 + + Center None @@ -960,8 +954,11 @@ 1214, 25 - - Top, Left + + Aktualisieren + + + GridViewDocSearch5 @@ -972,21 +969,12 @@ XtraTabControlDocs - - XtraTabPageSearch4 - - - Inherit - - - System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 561, 560 XtraTabPageSearch5 - - - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -1008,6 +996,9 @@ ContextMenuStripSQL + + ToolStripButtonRefreshSearches + @@ -1029,21 +1020,15 @@ GridViewDocSearch2 + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 - - - Center - - - Tile - Top, Left @@ -1056,6 +1041,9 @@ + + SplitContainerSearches.Panel2 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAZCAYAAABQDyyRAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 @@ -1074,9 +1062,6 @@ DBDPAAAAAElFTkSuQmCC - - - frmValidatorSearch @@ -1086,9 +1071,6 @@ Inherit - - 0, 0 - 647, 25 @@ -1116,26 +1098,26 @@ + + Tile + 349, 557 - - XtraTabControlSQL + + Inherit - - Default - GridViewDocSearch4 DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - Aktualisieren + + Top, Left 0, 0 @@ -1152,8 +1134,8 @@ Top, Left - - 0 + + XtraTabPageSearch4 @@ -1161,14 +1143,14 @@ Eigenschaften Datei - - Inherit + + 181, 22 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 563, 22 + + Default 349, 557 @@ -1176,11 +1158,17 @@ 3 - - 0 + + ToolStripSeparator2 - - XtraTabPageSearch2 + + GridControlDocSearch1 + + + ContextMenuStripWMFile + + + 0 Default @@ -1191,13 +1179,16 @@ 3 + + XtraTabControlSQL + - - ToolStripSeparator2 + + System.Windows.Forms.ToolStripDropDownButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 0, 0 @@ -1206,14 +1197,14 @@ 2 - - Tile + + Center $this - - ToolStripButtonRefreshSearches + + Tile Fill @@ -1230,8 +1221,11 @@ ToolStripDropDownButtonFile - - 0, 0 + + Inherit + + + 1 0 @@ -1245,11 +1239,8 @@ - - 0, 0 - - - + + XtraTabControlSQL @@ -1257,9 +1248,12 @@ - + 0, 0 + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + StatusStrip1 @@ -1281,8 +1275,8 @@ SplitContainerSearches.Panel1 - - tsslblSQL + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1290,8 +1284,8 @@ DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - XtraTabControlDocs + + Tile @@ -1308,8 +1302,8 @@ Aktualisieren - - 1 + + XtraTabPage3 0, 0 @@ -1323,8 +1317,8 @@ XtraTabControlSQL - - 1 + + 349, 557 @@ -1335,14 +1329,11 @@ - - System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - EigenschaftenToolStripMenuItem - - System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GridControlDocSearch3 0, 0 @@ -1371,12 +1362,24 @@ 1214, 607 - - Center + + 0 + + + 0 + + + GridViewSearch3 + + + Tile 647, 582 + + 563, 22 + @@ -1386,8 +1389,8 @@ XtraTabPage2 - - 0, 0 + + Inherit @@ -1398,14 +1401,17 @@ - - GridControlDocSearch1 + + 0 + + + XtraTabPageSearch2 - - Default + + Inherit @@ -1413,8 +1419,8 @@ 0, 585 - - 561, 560 + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -1428,6 +1434,9 @@ DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + tsslblSQL + 0 @@ -1437,12 +1446,12 @@ + + + ToolStripSeparator1 - - Tile - Fill @@ -1452,45 +1461,60 @@ Tile - - + + SplitContainerControlDoc + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 4 + + Inherit + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + + + 1 XtraTabPageSearch1 - - 182, 98 + + Tile System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + SplitContainerControlDoc.Panel1 + XtraTabPage1 - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + Tile - - GridControlDocSearch4 + + Fill 561, 560 - - Tile + + 0, 0 561, 560 + + ToolStrip1 + 0 @@ -1503,9 +1527,6 @@ 17, 17 - - en-US - 316, 17 diff --git a/app/DD_PM_WINDREAM/frmValidatorSearch.vb b/app/DD_PM_WINDREAM/frmValidatorSearch.vb index 440a608..bbcfa12 100644 --- a/app/DD_PM_WINDREAM/frmValidatorSearch.vb +++ b/app/DD_PM_WINDREAM/frmValidatorSearch.vb @@ -7,8 +7,12 @@ Imports DevExpress.XtraGrid.Columns Imports DevExpress.XtraGrid.Views.Base Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraTab +Imports DigitalData.GUIs.Common.DocumentResultList Imports DigitalData.Modules.EDMI.API.Constants Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback +Imports DigitalData.Modules.ZooFlow.Constants +Imports DigitalData.Modules.ZooFlow +Imports DigitalData.GUIs.Common Public Class frmValidatorSearch @@ -43,7 +47,35 @@ Public Class frmValidatorSearch Private _frmValidator As frmValidator 'You need a reference to Form1 Private Shared BW_DocPath As String Private Shared BW_DocID As Integer + Private Documentloader As Loader + Private Property OperationMode As OperationMode + Private ReadOnly Environment As Environment + Public Sub New(pfrmValidator As frmValidator, pEnvironment As Environment) + + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + _frmValidator = pfrmValidator + Environment = pEnvironment + End Sub + Private Function GetOperationMode() As OperationMode + Dim oOperationMode As OperationMode + If Environment.Service.Client Is Nothing Then + Return OperationMode.NoAppServer + End If + + If Environment.Service.Client.IsOnline AndAlso Environment.Service.Client.ServerAddress <> String.Empty And IDB_USES_WMFILESTORE = False Then + oOperationMode = OperationMode.WithAppServer + Else + oOperationMode = OperationMode.NoAppServer + End If + If OPERATION_MODE_FS = ClassConstants.OpModeFS_ZF Then + oOperationMode = OperationMode.ZooFlow + End If + + Return oOperationMode + End Function Public Sub TabPreload(Panel1Collapsed As Boolean, Panel2Collapsed As Boolean, TabCountSQL As Integer, TabCountDoc As Integer, DTSQL As DataTable, DTDOC As DataTable) Try If Me.InvokeRequired() Then @@ -402,6 +434,11 @@ Public Class frmValidatorSearch Catch ex As Exception LOGGER.Warn("Error initializing DocViewDocsValdiatorSearch: " & ex.Message) End Try + + OperationMode = GetOperationMode() + Documentloader = New Loader(LOGCONFIG, OperationMode, Environment.Service.Client, Environment.User) + + SplitContainerSearches.Panel1Collapsed = True If My.Settings.frmValidatorSearchPosition.IsEmpty = False Then If My.Settings.frmValidatorSearchPosition.X > 0 And My.Settings.frmValidatorSearchPosition.Y > 0 Then @@ -412,7 +449,7 @@ Public Class frmValidatorSearch Size = My.Settings.frmValidatorSearchSize End If SplitContainerSearches.SplitterDistance = My.Settings.frmValSearchSplitterDistance - _frmValidator = frmValidator + ToolStripDropDownButtonFile.Visible = False End Sub @@ -473,19 +510,25 @@ Public Class frmValidatorSearch ToolStripDropDownButtonFile.Visible = True End If If clsWMDocGrid.SELECTED_DOC_ID <> 0 Then - Dim msg = "Doc-ID: " & clsWMDocGrid.SELECTED_DOC_ID.ToString + Dim msg = "DocID: " & clsWMDocGrid.SELECTED_DOC_ID.ToString tslblDocID.Text = msg ToolStripDropDownButtonFile.Enabled = True - If Not IsNothing(clsWMDocGrid.SELECTED_DOC_PATH) And Not IsNothing(DocumentViewer1) Then - If clsWMDocGrid.SELECTED_DOC_PATH <> "" Then - DocumentViewer1.LoadFile(clsWMDocGrid.SELECTED_DOC_PATH) - DocumentViewer1.RightViewOnly(USER_RIGHT_VIEW_ONLY) - If USER_RIGHT_VIEW_ONLY = True Then - ToolStripDropDownButtonFile.Visible = False - Else - ToolStripDropDownButtonFile.Visible = True - End If + Dim oDocument As DocumentResultList.Document = Nothing + ' Load DocumentInfo + oDocument = Documentloader.Load(clsWMDocGrid.SELECTED_DOC_ID, clsWMDocGrid.SELECTED_DOC_PATH) + + If Not IsNothing(DocumentViewer1) Then + ' DocumentViewer1.LoadFile(clsWMDocGrid.SELECTED_DOC_PATH) + Dim oFileName = $"{clsWMDocGrid.SELECTED_DOC_ID}.{oDocument.Extension}" + DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocument.Contents)) + + DocumentViewer1.RightViewOnly(USER_RIGHT_VIEW_ONLY) + If USER_RIGHT_VIEW_ONLY = True Then + ToolStripDropDownButtonFile.Visible = False + Else + ToolStripDropDownButtonFile.Visible = True End If + End If Else @@ -628,13 +671,13 @@ Public Class frmValidatorSearch XtraTabControlSQL.SelectedTabPageIndex = 0 Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE")) End If - If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then - _DTDocSearches = BASEDATA_DT_PROFILE_SEARCHES_DOC - Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID") - Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") + If DT_FILTERED_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then + _DTDocSearches = DT_FILTERED_PROFILE_SEARCHES_DOC + Dim oConID = DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID") + Dim oCommand = DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND") oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True) XtraTabControlDocs.SelectedTabPageIndex = 0 - RefreshTabDoc(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE")) + RefreshTabDoc(oConID, oCommand, 0, DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE")) End If End Sub @@ -647,10 +690,10 @@ Public Class frmValidatorSearch End Sub Sub ReLoad_Active_DocTab() Dim oTabIndex = XtraTabControlDocs.SelectedTabPageIndex - Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(oTabIndex).Item("CONN_ID") - Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(oTabIndex).Item("SQL_COMMAND") + Dim oConID = DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(oTabIndex).Item("CONN_ID") + Dim oCommand = DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(oTabIndex).Item("SQL_COMMAND") oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True) - RefreshTabDoc(oConID, oCommand, oTabIndex, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(oTabIndex).Item("TAB_TITLE")) + RefreshTabDoc(oConID, oCommand, oTabIndex, DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(oTabIndex).Item("TAB_TITLE")) End Sub Private Sub LayoutZurücksetzenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LayoutZurücksetzenToolStripMenuItem.Click