diff --git a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb index e73cc67..223cc9c 100644 --- a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb +++ b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb @@ -45,7 +45,7 @@ Public Class ClassAllgemeineFunktionen Else If INACTIVITYRecognized = True Then oSql = $"UPDATE TBDD_USER_LOGIN_OUT SET COMMENT = 'Inactivity Detected' WHERE GUID IN (SELECT GUID FROM TBDD_USER_LOGIN_OUT - WHERE USER_ID = {USER_ID} AND MODULE = 'Process-Manager'" + WHERE USER_ID = {USER_ID} AND UPPER(MODULE) = UPPER('Process-Manager')" ClassDatabase.Execute_non_Query(oSql, "Inactivity insert") End If diff --git a/app/DD_PM_WINDREAM/ClassDatabase.vb b/app/DD_PM_WINDREAM/ClassDatabase.vb index 3d33bfa..172d897 100644 --- a/app/DD_PM_WINDREAM/ClassDatabase.vb +++ b/app/DD_PM_WINDREAM/ClassDatabase.vb @@ -44,17 +44,30 @@ Public Class ClassDatabase End Try Return connectionString End Function - Public Shared Function Init() + Public Shared Function Init(Optional ConString As String = "") Try - SQLSERVERConnectionString = CONNECTION_STRING + If ConString = String.Empty Then + SQLSERVERConnectionString = CONNECTION_STRING + End If + Dim SQLconnect As New SqlClient.SqlConnection - SQLconnect.ConnectionString = SQLSERVERConnectionString + If ConString <> String.Empty Then + SQLconnect.ConnectionString = ConString + Else + SQLconnect.ConnectionString = SQLSERVERConnectionString + End If + SQLconnect.Open() SQLconnect.Close() Return True Catch ex As Exception LOGGER.Error(ex) - LOGGER.Info("Fehler bei Database-Init: " & ex.Message, True) + If ConString <> String.Empty Then + LOGGER.Info($"Error initializing Database [{ConString}] " & ex.Message, True) + Else + LOGGER.Info($"Error initializing Database [{CONNECTION_STRING}] " & ex.Message, True) + End If + Return False End Try End Function diff --git a/app/DD_PM_WINDREAM/ClassIDBData.vb b/app/DD_PM_WINDREAM/ClassIDBData.vb index 334a77e..47c09f5 100644 --- a/app/DD_PM_WINDREAM/ClassIDBData.vb +++ b/app/DD_PM_WINDREAM/ClassIDBData.vb @@ -9,7 +9,7 @@ ''' Public Function Init() Dim oSQL = $"SELECT * FROM VWIDB_BE_ATTRIBUTE" - DTVWIDB_BE_ATTRIBUTE = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB) + DTVWIDB_BE_ATTRIBUTE = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB_READ) End Function Public IDBSystemIndices As List(Of String) Public Function GetIndicesByBE(ByVal BusinessEntity As String) As String() @@ -101,7 +101,7 @@ LOGGER.Debug($"oAttributeValue for Attribute [{oAttributeName}] is so far nothing..Now trying FNIDB_PM_GET_VARIABLE_VALUE ") End If Dim oFNSQL = $"SELECT * FROM [dbo].[FNIDB_PM_GET_VARIABLE_VALUE] ({CURRENT_DOC_ID},'{oAttributeName}','{USER_LANGUAGE}',CONVERT(BIT,'{IDB_USES_WMFILESTORE}'))" - oAttributeValue = ClassDatabase.Return_Datatable_ConStr(oFNSQL, CONNECTION_STRING_IDB) + oAttributeValue = ClassDatabase.Return_Datatable_ConStr(oFNSQL, CONNECTION_STRING_IDB_READ) Dim odt As DataTable = oAttributeValue If odt.Rows.Count = 1 Then oAttributeValue = odt.Rows(0).Item(0) @@ -122,7 +122,7 @@ oID_IS_FOREIGN = 1 End If Dim oDELSQL = $"EXEC PRIDB_DELETE_TERM_OBJECT_METADATA {CURRENT_DOC_ID},'{oAttributeName}','{oTerm2Delete}','{USER_USERNAME}','{USER_LANGUAGE}',{oID_IS_FOREIGN}" - ClassDatabase.Execute_non_Query_ConStr(oDELSQL, CONNECTION_STRING_IDB) + ClassDatabase.Execute_non_Query_ConStr(oDELSQL, CONNECTION_STRING_IDB_WRITE) Catch ex As Exception LOGGER.Error(ex) @@ -133,7 +133,7 @@ Public Function Delete_AttributeData(pIDB_OBJID As Int64, pAttributeName As String) As Object Try Dim oDELSQL = $"EXEC PRIDB_DELETE_ATTRIBUTE_DATA {pIDB_OBJID},'{pAttributeName}','{USER_USERNAME}'" - ClassDatabase.Execute_non_Query_ConStr(oDELSQL, CONNECTION_STRING_IDB) + ClassDatabase.Execute_non_Query_ConStr(oDELSQL, CONNECTION_STRING_IDB_WRITE) Catch ex As Exception LOGGER.Error(ex) @@ -207,7 +207,7 @@ For Each oNewValueRow As DataRow In oDTMyNewValues.Rows Dim oSuccess As Boolean = False Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValueRow.Item(1).ToString}','{USER_LANGUAGE}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" - oSuccess = ClassDatabase.Execute_non_Query_ConStr(oFNSQL, CONNECTION_STRING_IDB) + oSuccess = ClassDatabase.Execute_non_Query_ConStr(oFNSQL, CONNECTION_STRING_IDB_WRITE) If oSuccess = False Then Return False End If @@ -215,7 +215,7 @@ Return True Else Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {CURRENT_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValue}','{USER_LANGUAGE}',0,@OMD_ID = @NEW_OBJ_MD_ID OUTPUT" - Return ClassDatabase.Execute_non_Query_ConStr(oFNSQL, CONNECTION_STRING_IDB) + Return ClassDatabase.Execute_non_Query_ConStr(oFNSQL, CONNECTION_STRING_IDB_WRITE) End If Catch ex As Exception diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index c0f0af9..4c31ea6 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -49,6 +49,9 @@ Public Class ClassInit 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 End If 'VIEWER_UNIVERSAL = CONFIG.Config.UniversalViewerPath @@ -108,8 +111,16 @@ Public Class ClassInit frmKonfig.ShowDialog() dbResult = ClassDatabase.Init() End If + If CONNECTION_STRING_APP_SERVER <> String.Empty Then + If ClassDatabase.Init(CONNECTION_STRING_APP_SERVER) = False Then + MsgBox("ApplicationServer can not be reached! Check Your configuration.", MsgBoxStyle.Information) + If dbResult = True Then + CONNECTION_STRING_READ = CONNECTION_STRING + End If + End If + End If - If dbResult = False Then + If dbResult = False Then ERROR_STATE = "FAILED DBCONNECTION" MsgBox("Error in init database. (Connection failed) More information in the logfile.", MsgBoxStyle.Critical) Return False diff --git a/app/DD_PM_WINDREAM/ClassParamRefresh.vb b/app/DD_PM_WINDREAM/ClassParamRefresh.vb index d2b4898..2d3e35e 100644 --- a/app/DD_PM_WINDREAM/ClassParamRefresh.vb +++ b/app/DD_PM_WINDREAM/ClassParamRefresh.vb @@ -45,17 +45,19 @@ Dim CON_ID = oMode.Replace("PM.IDB_CONID!", "") Dim oConString = ClassDatabase.Get_ConnectionString(CON_ID) CONNECTION_STRING_IDB = oConString - Dim oSQL = $"SELECT * FROM TBIDB_ATTRIBUTE" - Dim oDT As DataTable = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB) - If Not IsNothing(oDT) Then - If oDT.Rows.Count > 0 Then - IDB_ACTIVE = True - Else - LOGGER.Warn($"Got an IDB-ConnID [{CON_ID}] but check DTAttribute.Row.Count is [{oDT.Rows.Count}]!!") - End If + If ClassDatabase.Init(CONNECTION_STRING_IDB_APP_SERVER) = False Then + IDB_ACTIVE = False Else + IDB_ACTIVE = True LOGGER.Warn($"Got an IDB-ConnID [{CON_ID}] but check DT Attribute is Nothing!!") End If + ElseIf oMode.StartsWith("PM.IDB_APP_SERV_CONID!") Then + Dim CON_ID = oMode.Replace("PM.IDB_APP_SERV_CONID!", "") + Dim oConString = ClassDatabase.Get_ConnectionString(CON_ID) + CONNECTION_STRING_IDB_APP_SERVER = oConString + If ClassDatabase.Init(CONNECTION_STRING_IDB_APP_SERVER) = True Then + CONNECTION_STRING_IDB_APP_SERVER = "" + End If ElseIf oMode = "PM.MONITORING" Then MONITORING_ACTIVE = True ElseIf oMode = "PM.GHOSTMODE" Then @@ -93,12 +95,32 @@ Catch ex As Exception LAST_ADDED_COLUMN = "" + End Try + ElseIf oMode.StartsWith("PM.USE_APPSERVER") Then + Dim oUSE_APPSERVER = oMode.Replace("PM.USE_APPSERVER=", "") + Try + USE_APPSERVER = CBool(oUSE_APPSERVER) + Catch ex As Exception + USE_APPSERVER = False + End Try Else LOGGER.Info($"Wrong oMode: {oMode}") End If Next + If IDB_ACTIVE Then + If CONNECTION_STRING_APP_SERVER <> String.Empty Then + If USE_APPSERVER = True Then + CONNECTION_STRING_IDB_READ = CONNECTION_STRING_APP_SERVER + Else + CONNECTION_STRING_IDB_READ = CONNECTION_STRING_IDB + End If + Else + CONNECTION_STRING_IDB_READ = CONNECTION_STRING_IDB + End If + CONNECTION_STRING_IDB_WRITE = CONNECTION_STRING_IDB + End If End If oStopwatch.Done() End Sub diff --git a/app/DD_PM_WINDREAM/ModuleMySettings.vb b/app/DD_PM_WINDREAM/ModuleMySettings.vb index 11dd667..1cd97fe 100644 --- a/app/DD_PM_WINDREAM/ModuleMySettings.vb +++ b/app/DD_PM_WINDREAM/ModuleMySettings.vb @@ -3,7 +3,11 @@ Public SOURCE_INIT As Boolean = False Public CONNECTION_STRING As String = "" Public CONNECTION_STRING_APP_SERVER As String = "" + Public CONNECTION_STRING_READ As String Public CONNECTION_STRING_IDB As String = "" + Public CONNECTION_STRING_IDB_APP_SERVER As String = "" + Public CONNECTION_STRING_IDB_READ As String = "" + Public CONNECTION_STRING_IDB_WRITE As String = "" Public IDB_ACTIVE As Boolean = False Public IDB_USES_WMFILESTORE As Boolean = False Public BASIC_CONF_VISIBLE As Boolean = True diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index 94e108b..32c3ee4 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -76,6 +76,7 @@ Module ModuleRuntimeVariables Public INACTIVITYRecognized As Boolean = False Public LAST_EDITED_COLUMN As String = "NONE" Public LAST_ADDED_COLUMN As String = "NONE" + Public USE_APPSERVER As Boolean = False Public LICENSE_COUNT As Integer = 0 Public LICENSE_EXPIRED As Boolean = False diff --git a/app/DD_PM_WINDREAM/frmDesignerLayout.vb b/app/DD_PM_WINDREAM/frmDesignerLayout.vb index 4d96b41..70bd601 100644 --- a/app/DD_PM_WINDREAM/frmDesignerLayout.vb +++ b/app/DD_PM_WINDREAM/frmDesignerLayout.vb @@ -105,7 +105,7 @@ Public Class frmDesignerLayout _LayoutSerializer = New LayoutControlSerializer(LOGCONFIG) Dim oSQL = "Select * from TBIDB_LAYOUT_CONFIG" - FormsDatatable = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB) + FormsDatatable = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB_WRITE) If Not IsNothing(FormsDatatable) Then For Each oRow As DataRow In FormsDatatable.Rows Dim oItem As New BarButtonItem(RibbonControl1.Manager, oRow.Item("TITLE")) @@ -149,7 +149,7 @@ Public Class frmDesignerLayout Dim oSql As String = $"UPDATE TBIDB_LAYOUT_CONFIG SET XML_CONTENT = '{oControls}', XML_LAYOUT = '{oLayout}', CHANGED_WHO = '{Environment.UserName}' WHERE GUID = {SelectedLayoutId}" - ClassDatabase.Execute_non_Query_ConStr(oSql, CONNECTION_STRING_IDB) + ClassDatabase.Execute_non_Query_ConStr(oSql, CONNECTION_STRING_IDB_WRITE) End Using End Using End Sub diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index e528294..56de29e 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -26,8 +26,6 @@ Partial Class frmMain Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) Me.ImageListProfile = New System.Windows.Forms.ImageList(Me.components) Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() - Me.TBPM_PROFILEBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_PROFILETableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter() Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.Panel1 = New System.Windows.Forms.Panel() Me.GridControl_Docs = New DevExpress.XtraGrid.GridControl() @@ -64,12 +62,6 @@ Partial Class frmMain Me.AnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.OutOfRangePMFixierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TimerRefresh = New System.Windows.Forms.Timer(Me.components) - Me.TBPM_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_USERTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_USERTableAdapter() - Me.TBPM_KONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_KONFIGURATIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() - Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_PROFILE_FILESTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() Me.TimerReminder = New System.Windows.Forms.Timer(Me.components) Me.Timer5Mins = New System.Windows.Forms.Timer(Me.components) Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) @@ -178,7 +170,6 @@ Partial Class frmMain Me.TimerInactivity = New System.Windows.Forms.Timer(Me.components) Me.Timer1 = New System.Windows.Forms.Timer(Me.components) CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBPM_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() CType(Me.GridControl_Docs, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuGrid.SuspendLayout() @@ -189,9 +180,6 @@ Partial Class frmMain CType(Me.NavBarControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.cmsNavPane.SuspendLayout() Me.ContextMenuNotifyIcon.SuspendLayout() - CType(Me.TBPM_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBPM_PROFILE_FILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemProgressBar1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DocumentViewerBarManager1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -213,15 +201,6 @@ Partial Class frmMain Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet" Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' - 'TBPM_PROFILEBindingSource - ' - Me.TBPM_PROFILEBindingSource.DataMember = "TBPM_PROFILE" - Me.TBPM_PROFILEBindingSource.DataSource = Me.DD_DMSLiteDataSet - ' - 'TBPM_PROFILETableAdapter - ' - Me.TBPM_PROFILETableAdapter.ClearBeforeFill = True - ' 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False @@ -489,33 +468,6 @@ Partial Class frmMain ' Me.TimerRefresh.Interval = 120000 ' - 'TBPM_USERBindingSource - ' - Me.TBPM_USERBindingSource.DataMember = "TBDD_USER" - Me.TBPM_USERBindingSource.DataSource = Me.DD_DMSLiteDataSet - ' - 'TBPM_USERTableAdapter - ' - Me.TBPM_USERTableAdapter.ClearBeforeFill = True - ' - 'TBPM_KONFIGURATIONBindingSource - ' - Me.TBPM_KONFIGURATIONBindingSource.DataMember = "TBPM_KONFIGURATION" - Me.TBPM_KONFIGURATIONBindingSource.DataSource = Me.DD_DMSLiteDataSet - ' - 'TBPM_KONFIGURATIONTableAdapter - ' - Me.TBPM_KONFIGURATIONTableAdapter.ClearBeforeFill = True - ' - 'TBPM_PROFILE_FILESBindingSource - ' - Me.TBPM_PROFILE_FILESBindingSource.DataMember = "TBPM_PROFILE_FILES" - Me.TBPM_PROFILE_FILESBindingSource.DataSource = Me.DD_DMSLiteDataSet - ' - 'TBPM_PROFILE_FILESTableAdapter - ' - Me.TBPM_PROFILE_FILESTableAdapter.ClearBeforeFill = True - ' 'TimerReminder ' ' @@ -1651,7 +1603,6 @@ Partial Class frmMain Me.StatusBar = Me.RibbonStatusBar1 Me.ToolTip1.SetToolTip(Me, resources.GetString("$this.ToolTip")) CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBPM_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() CType(Me.GridControl_Docs, System.ComponentModel.ISupportInitialize).EndInit() @@ -1664,9 +1615,6 @@ Partial Class frmMain CType(Me.NavBarControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.cmsNavPane.ResumeLayout(False) Me.ContextMenuNotifyIcon.ResumeLayout(False) - CType(Me.TBPM_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBPM_PROFILE_FILESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemProgressBar1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DocumentViewerBarManager1, System.ComponentModel.ISupportInitialize).EndInit() @@ -1679,18 +1627,10 @@ Partial Class frmMain End Sub Friend WithEvents DD_DMSLiteDataSet As DD_ProcessManager.DD_DMSLiteDataSet - Friend WithEvents TBPM_PROFILEBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_PROFILETableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter Friend WithEvents TableAdapterManager As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager Friend WithEvents ImageListProfile As System.Windows.Forms.ImageList Friend WithEvents NotifyIcon1 As System.Windows.Forms.NotifyIcon Friend WithEvents TimerRefresh As System.Windows.Forms.Timer - Friend WithEvents TBPM_USERBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_USERTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_USERTableAdapter - Friend WithEvents TBPM_KONFIGURATIONBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_KONFIGURATIONTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter - Friend WithEvents TBPM_PROFILE_FILESBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents TBPM_PROFILE_FILESTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter Friend WithEvents TimerReminder As System.Windows.Forms.Timer Friend WithEvents ContextMenuGrid As ContextMenuStrip Friend WithEvents CMGroupStart As ToolStripMenuItem diff --git a/app/DD_PM_WINDREAM/frmMain.en-US.resx b/app/DD_PM_WINDREAM/frmMain.en-US.resx index 5bab14c..92fa0d8 100644 --- a/app/DD_PM_WINDREAM/frmMain.en-US.resx +++ b/app/DD_PM_WINDREAM/frmMain.en-US.resx @@ -122,7 +122,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAeQBBAHkAQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAfQBBAH0AQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 94ade2a..93d0684 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -540,15 +540,15 @@ -1 - - Metadaten Datei - DevExpress.XtraPrinting.Preview.PrintPreviewStaticItem, DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -1 + + DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + Tahoma, 12pt @@ -666,6 +666,9 @@ Sei&teneinstellungen... + + + CMFileMetadata @@ -1109,9 +1112,6 @@ Verkleinern - - - Timer5Mins @@ -1766,6 +1766,9 @@ Einzeln + + XtraSaveFileDialog1 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -1778,8 +1781,8 @@ p6DuHTTD81eioP5bqPqHBSpw/O/AclnyC9lwIPbajFPHAAAAAElFTkSuQmCC - - bbiClosePreview + + -1 @@ -1861,7 +1864,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAdwBBgHsAQYBEAEAARABAAT/AQkBEAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAdwBBgEEAQcBEAEAARABAAT/AQkBEAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1905,9 +1908,6 @@ keine - - DevExpress.XtraPrinting.Preview.PrintPreviewBarItem, DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - TBPM_USERBindingSource @@ -2044,8 +2044,8 @@ -1 - - PrintPreviewBarCheckItem19 + + bbiClosePreview 4 @@ -2525,8 +2525,8 @@ -1 - - + + -1 bsi_GhostMode @@ -2654,8 +2654,8 @@ $this - - DevExpress.XtraBars.BarDockControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + Metadaten Datei DevExpress.XtraPrinting.Preview.PrintPreviewBarItem, DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -2925,9 +2925,6 @@ DevExpress.XtraPrinting.Preview.PrintPreviewBarItem, DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - -1 - -1 @@ -3263,6 +3260,9 @@ DevExpress.XtraPrinting.Preview.PrintPreviewSubItem, DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + PrintPreviewBarCheckItem19 + RibbonPageGroup1 @@ -3278,8 +3278,8 @@ bbiHandTool - - XtraSaveFileDialog1 + + -1 @@ -3452,8 +3452,8 @@ Hand - - + + DevExpress.XtraPrinting.Preview.PrintPreviewBarItem, DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a 8 @@ -3573,7 +3573,7 @@ 17, 56 - 919, 134 + 585, 95 923, 56 @@ -3591,16 +3591,16 @@ 666, 56 - 257, 95 + 728, 17 - 541, 95 + 17, 56 - 392, 95 + 863, 17 - 17, 134 + 640, 56 17, 17 @@ -3609,16 +3609,16 @@ 391, 17 - 908, 17 + 490, 17 - 17, 173 + 875, 95 - 581, 134 + 247, 95 - 1065, 95 + 541, 56 198 @@ -3627,40 +3627,40 @@ 179, 17 - 351, 134 + 17, 95 - 597, 17 + 179, 17 213, 56 - 701, 134 + 367, 95 - 1078, 134 + 744, 95 - 444, 134 + 110, 95 - 199, 134 + 822, 56 - 1023, 17 + 605, 17 - 816, 95 + 292, 56 - 950, 95 + 426, 56 - 662, 95 + 138, 56 - 770, 17 + 352, 17 True diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index de84785..5d81532 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -104,7 +104,9 @@ Public Class frmMain End Try End If - + If INACTIVITYRecognized Then + Exit Sub + End If Try ClassAllgemeineFunktionen.LoginOut("LOGOUT") LOGGER.Info("ProcessManager closed - " & Now, False) @@ -161,8 +163,8 @@ Public Class frmMain LOGGER.Error(ex) MessageBox.Show("Error loading CurrentUICulture-Info!", "Attention:", MessageBoxButtons.OK, MessageBoxIcon.Exclamation) End Try - If Refresh_ConnectionString() = True Then - Try + + Try bsiLicenses.Caption = "Anzahl Lizenzen: " & LICENSE_COUNT LOGGER.Debug("Initializing MainForm....") If ERROR_STATE = "NO USER" Then @@ -279,7 +281,7 @@ Public Class frmMain SOURCE_INIT = Init_IDB() If SOURCE_INIT = True Then Dim oSQL = $"SELECT SQL_COMMAND FROM TBDD_SQL_COMMANDS WHERE TITLE = 'PM_IDB_DOC_DATA'" - IDB_DOC_DATA_SQL = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, "frmMainload-PM_IDPDOCDATA") + IDB_DOC_DATA_SQL = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING_READ, "frmMainload-PM_IDPDOCDATA") LOGGER.Debug($"Got the IDB_DOC_DATA_SQL..{IDB_DOC_DATA_SQL}") End If bsiGeneralInfo.Caption = "IDB active" @@ -291,8 +293,8 @@ Public Class frmMain RibbonPageGroupBasicConf.Visible = True End If LOGGER.Debug("MainForm initialized!") - End If - FormOpenClose = False + + FormOpenClose = False End Sub Sub Check_Timer_Notification() Try @@ -404,20 +406,6 @@ Public Class frmMain - Function Refresh_ConnectionString() - Try - TBPM_KONFIGURATIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING - TBPM_PROFILETableAdapter.Connection.ConnectionString = CONNECTION_STRING - TBPM_USERTableAdapter.Connection.ConnectionString = CONNECTION_STRING - TBPM_PROFILE_FILESTableAdapter.Connection.ConnectionString = CONNECTION_STRING - - Return True - Catch ex As Exception - LOGGER.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Refresh_ConnectionString:") - Return False - End Try - End Function Private Function GetXML_OverviewLayoutName() Dim Filename As String = String.Format("DevExpressGridViewOverview_UserLayout_{0}.xml", GRID_LOAD_TYPE) Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename) @@ -1342,7 +1330,7 @@ Public Class frmMain CURRENT_DOC_GUID = CURRENT_JUMP_DOC_GUID CURRENT_DOC_PATH = DOC_PATH Dim oSQL = $"SELECT [dbo].[FNPM_CHECK_DocGUID_Valid] ({CURRENT_DOC_GUID})" - Dim oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, $"Item_Scope-FNPM_CHECK_DocGUID_Valid") + Dim oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING_READ, $"Item_Scope-FNPM_CHECK_DocGUID_Valid") Try If CBool(oResult) = True Then Load_Profil_from_Grid(oHitProfilID) @@ -2087,7 +2075,7 @@ Public Class frmMain Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniGrundeinstellung.ItemClick Try frmKonfig.ShowDialog() - Refresh_ConnectionString() + ' Load_Profil() Check_Timer_Notification() Catch ex As Exception @@ -2115,13 +2103,13 @@ Public Class frmMain End Sub Private Sub bbiProfilverwaltung_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbiProfilverwaltung.ItemClick - Dim AdminSecurity As Boolean = False - AdminSecurity = TBPM_KONFIGURATIONTableAdapter.cmdGetAdminSecurity() - If AdminSecurity = True Then - frmLoginAdmin.ShowDialog() - Else - frmAdministration.Show() - End If + 'Dim AdminSecurity As Boolean = False + 'AdminSecurity = TBPM_KONFIGURATIONTableAdapter.cmdGetAdminSecurity() + 'If AdminSecurity = True Then + ' frmLoginAdmin.ShowDialog() + 'Else + frmAdministration.Show() + ' End If End Sub @@ -2280,7 +2268,7 @@ Public Class frmMain Dim oReceipiant = "" Dim oFocusedDocGUID = GridView_Docs.GetFocusedRowCellValue(GridView_Docs.Columns("GUID")) Dim oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({oFocusedDocGUID},1)" - Dim oFilePath = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, $"DateiAlsLinkVersendenToolStripMenuItem_Click") + Dim oFilePath = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING_READ, $"DateiAlsLinkVersendenToolStripMenuItem_Click") Dim oLink = "

Link zur Datei

" Dim oLink2 = "Link zur Datei" @@ -2342,6 +2330,14 @@ Public Class frmMain End If INACTIVITYRecognized = True + Dim omsg As String = "Sie wurden aufgrund von Inaktivität automatisch abgemeldet!" + + If USER_LANGUAGE <> "de-DE" Then + omsg = "Due to inactivity we closed all actions and You were logged out automatically." + End If + Hide() + ClassAllgemeineFunktionen.LoginOut("LOGOUT") + MsgBox(omsg, MsgBoxStyle.Information, ADDITIONAL_TITLE) Application.Exit() Catch ex As Exception LOGGER.Error(ex.Message) diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 4f22bf4..85135e7 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -35,7 +35,7 @@ Public Class frmValidator Public Shared WMDocPathWindows As String Public WMDocFileString As String - + Private DocPathWindows As String Dim OLD_Document_Path As String = "" Dim ValueDTP As Date Dim AnzDoks As Integer @@ -264,7 +264,7 @@ Public Class frmValidator RibbonPageConversations.Visible = False If IDB_ACTIVE Then Dim oSQL = $"SELECT * FROM [dbo].[FNIDB_OBJECT_DYNAMIC_CONFIG] ({CURRENT_DOC_ID},{USER_ID})" - DTDYNAMIC_RIGHTS = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB, "FNIDB_OBJECT_DYNAMIC_CONFIG") + DTDYNAMIC_RIGHTS = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB_READ, "FNIDB_OBJECT_DYNAMIC_CONFIG") RibbonPageGroupConv1.Enabled = False Dim oView As DataView = New DataView(DTDYNAMIC_RIGHTS) Debug.WriteLine(oView.Count, "oView before") @@ -2377,13 +2377,6 @@ Public Class frmValidator 'process not found, return false Return False End Function - - - Function ReplaceWindreamDriveLetter(Filepath As String) As String - Return Filepath. - Replace("W:", "\\windream\objects"). - Replace("K:", "\\windream\objects") - End Function Function Get_Next_GUID() As Integer Try LOGGER.Debug("Get_Next_GUID...") @@ -2466,20 +2459,23 @@ Public Class frmValidator LOGGER.Debug($"Checking file 0 [{oResult}] exists?...") WMDocPathWindows = String.Empty If File.Exists(oResult) = False Then - LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...") + DocPathWindows = oResult + LOGGER.Info($"GetWMDocPathWindows returned false [{oResult}] - trying with standard again...") oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)" - oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, "GetDocPathWindows2") - LOGGER.Debug($"Checking file 1[{oResult}] exists?...") - If File.Exists(oResult) = False Then - LOGGER.Warn($"GetDocPathWindows: File [{oResult}] not existing!") - Return False - End If + oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, "GetDocPathWindows2") + LOGGER.Debug($"Checking file 1[{oResult}] exists?...") + If File.Exists(oResult) = False Then + LOGGER.Info($"GetWMDocPathWindows FileExists2 also returned false [{oResult}]!") + DocPathWindows = oResult + LOGGER.Warn($"GetDocPathWindows: File [{oResult}] not existing!") + Return False + End If End If WMDocPathWindows = oResult OLD_Document_Path = WMDocPathWindows CURRENT_DOC_PATH = WMDocPathWindows - LOGGER.Debug($"CURRENT_DOC_PATH: {CURRENT_DOC_PATH}") + LOGGER.Info($"GetWMDocPathWindows CURRENT_DOC_PATH: {CURRENT_DOC_PATH}") Return True Catch ex As Exception WMDocPathWindows = "" @@ -2549,7 +2545,8 @@ Public Class frmValidator LOGGER.Debug("Dokument-GUID: '" & CURRENT_DOC_GUID.ToString & "'") If CURRENT_DOC_GUID > 0 Then If GetDocPathWindows(0) = False Then - MsgBox("The file can not be diplayed!", MsgBoxStyle.Critical, ADDITIONAL_TITLE) + SetStatusLabel($"File not accessable: {DocPathWindows}", "DarkOrange") + MsgBox("The file can not be diplayed or is not accessable!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) End If If IDB_ACTIVE = False Then If CreateWMObject() = False Then @@ -3606,7 +3603,7 @@ Public Class frmValidator If IDB_ACTIVE = True Then Try Dim oSQL = $"select Attribut, TERM_VALUE from VWIDB_VALUE_TEXT WHERE LANG_CODE = '{USER_LANGUAGE}' AND IDB_OBJ_ID = {CURRENT_DOC_ID} AND Attribut in ('PM_Info1','PM_Info2') ORDER BY Attribut" - Dim oDTINFO As DataTable = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB) + Dim oDTINFO As DataTable = ClassDatabase.Return_Datatable_ConStr(oSQL, CONNECTION_STRING_IDB_READ) If Not IsNothing(oDTINFO) Then Dim oColor As System.Drawing.Color If oDTINFO.Rows.Count > 0 Then @@ -5458,7 +5455,7 @@ Public Class frmValidator result = MessageBox.Show(oQuestion.Rows(0).Item("STRING1").ToString, oQuestion.Rows(0).Item("STRING2").ToString, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) If result = MsgBoxResult.Yes Then Dim oSQL = $"EXEC PRIDB_END_CONVERSATION {ChatControl1.CurrentConversationID}, '{USER_USERNAME}', '{USER_LANGUAGE}'" - If ClassDatabase.Execute_non_Query_ConStr(oSQL, CONNECTION_STRING_IDB, "EXEC PRIDB_END_CONVERSATION") = True Then + If ClassDatabase.Execute_non_Query_ConStr(oSQL, CONNECTION_STRING_IDB_WRITE, "EXEC PRIDB_END_CONVERSATION") = True Then btnitemConversationEnd.Enabled = False SplitContainer2_DV_Chat.Collapsed = True btnitemConversationEnd.Enabled = True