diff --git a/app/DD_PM_WINDREAM/App.config b/app/DD_PM_WINDREAM/App.config index 705200f..c6ca9a7 100644 --- a/app/DD_PM_WINDREAM/App.config +++ b/app/DD_PM_WINDREAM/App.config @@ -1,73 +1,106 @@ - + - - -
- - - - - - - - - - - - 0, 0 - - - 0, 0 - - - 890, 790 - - - 890, 790 - - - 5 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 0, 0 - - - 563 - - - Normal - - - 0, 0 - - - 0, 0 - - - Normal - - - - + + +
+ + +
+ + + + + + Skin/Office 2016 Colorful + + + + + + + + + + + + + + + True + + + + + + + + + + + + + + + + + + + + + + 0, 0 + + + 0, 0 + + + 890, 790 + + + 890, 790 + + + 5 + + + 0, 0 + + + 0, 0 + + + 0, 0 + + + 0, 0 + + + 0, 0 + + + 0, 0 + + + 0, 0 + + + 0, 0 + + + 563 + + + Normal + + + 0, 0 + + + 0, 0 + + + Normal + + + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index 18ccceb..0857551 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -3,6 +3,7 @@ Imports System.Globalization Imports DLLLicenseManager Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Config +Imports System.Threading Public Class ClassInit @@ -188,56 +189,59 @@ Public Class ClassInit FINALINDICES.init() If IDB_ACTIVE = True Then IDBData = New ClassIDBData() - - End If Try - USER_RIGHT1 = DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT1") - Catch ex As Exception - USER_RIGHT1 = False - End Try - Try - USER_RIGHT2 = DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT2") - Catch ex As Exception - USER_RIGHT2 = False - End Try - Try - USER_RIGHT3 = DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT3") - Catch ex As Exception - USER_RIGHT3 = False - End Try - Try - USER_RIGHT4 = DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT4") - Catch ex As Exception - USER_RIGHT4 = False - End Try - LOGGER.Debug("User exists....") - 'Am System anmelden - Refresh_Licence() - 'Check_User_Exists_in_PMGroups() + USER_RIGHT_VIEW_ONLY = DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT2") + Catch ex As Exception + USER_RIGHT_VIEW_ONLY = False + End Try + Try + USER_RIGHT3 = DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT3") + Catch ex As Exception + USER_RIGHT3 = False + End Try + Try + USER_RIGHT4 = DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT4") + Catch ex As Exception + USER_RIGHT4 = False + End Try + LOGGER.Debug("User exists....") + 'Am System anmelden + Refresh_Licence() + 'Check_User_Exists_in_PMGroups() + 'Dim Culture = CultureInfo.CreateSpecificCulture("en-US") + '' The following line provides localization for the application's user interface. + 'Thread.CurrentThread.CurrentUICulture = Culture + '' The following line provides localization for data formats. + 'Thread.CurrentThread.CurrentCulture = Culture + '' Set this culture as the default culture for all threads in this application. + '' Note: The following properties are supported in the .NET Framework 4.5+ + 'CultureInfo.DefaultThreadCurrentCulture = Culture + 'CultureInfo.DefaultThreadCurrentUICulture = Culture - If ClassAllgemeineFunktionen.LoginOut("LOGIN") = True Then - USERCOUNT_LOGGED_IN += 1 - End If - 'sql = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Process-Manager') AND CLIENT_ID = {0}", 1) - ' USERCOUNT_LOGGED_IN = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) - 'sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE = 'Process-Manager'" - 'ClassDatabase.Execute_non_Query(sql, True) - LOGGER.Debug("Count Users logged in: " & USERCOUNT_LOGGED_IN.ToString) - If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then - MsgBox("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") + If ClassAllgemeineFunktionen.LoginOut("LOGIN") = True Then + USERCOUNT_LOGGED_IN += 1 + End If + + 'sql = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Process-Manager') AND CLIENT_ID = {0}", 1) + ' USERCOUNT_LOGGED_IN = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) + 'sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE = 'Process-Manager'" + 'ClassDatabase.Execute_non_Query(sql, True) + LOGGER.Debug("Count Users logged in: " & USERCOUNT_LOGGED_IN.ToString) + If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then + MsgBox("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:") LOGGER.Info("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für Process Manager!") If USER_IS_ADMIN = False Then - ClassAllgemeineFunktionen.LoginOut("LOGOUT") + ClassAllgemeineFunktionen.LoginOut("LOGOUT") LOGGER.Info("Wieder abgemeldet - START INCOMPLETE") ERROR_STATE = "START INCOMPLETE" - End If End If - 'Alles OK bis hierhin...nun die FolderwatchKonfig laden - LOGGER.Debug("Init Userlogin successfull completed....") End If + 'Alles OK bis hierhin...nun die FolderwatchKonfig laden + LOGGER.Debug("Init Userlogin successfull completed....") + End If Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("Unexpected Error in InitUserLogin: " & ex.Message, True) diff --git a/app/DD_PM_WINDREAM/ClassParamRefresh.vb b/app/DD_PM_WINDREAM/ClassParamRefresh.vb index 85bcd04..8748acd 100644 --- a/app/DD_PM_WINDREAM/ClassParamRefresh.vb +++ b/app/DD_PM_WINDREAM/ClassParamRefresh.vb @@ -14,8 +14,11 @@ End Try Try ADDITIONAL_TITLE = DT_CHECKUSER.Rows(0).Item("ADDITIONAL_TITLE") + If ADDITIONAL_TITLE = String.Empty Then + ADDITIONAL_TITLE = My.Application.Info.ProductName + End If Catch ex As Exception - ADDITIONAL_TITLE = "" + ADDITIONAL_TITLE = My.Application.Info.ProductName End Try Dim oSplitWorkMode As String() = WORKING_MODE.Split("#") @@ -55,6 +58,7 @@ ElseIf oMode.StartsWith("PM.COLORSCHEME") Then Dim oColorScheme = oMode.Replace("PM.COLORSCHEME=", "") RIBBON_COLOR_SCHEME = oColorScheme.ToUpper + Else LOGGER.Info($"Wrong oMode: {oMode}") End If diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index cc5e365..3640541 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -35,7 +35,7 @@ Module ModuleRuntimeVariables Public USER_EXISTS = False Public USER_IN_MODULE = False Public USER_RIGHT_FILE_DELETE As Boolean = False - Public USER_RIGHT1 As Boolean = False + Public USER_RIGHT_VIEW_ONLY As Boolean = False Public USER_RIGHT2 As Boolean = False Public USER_RIGHT3 As Boolean = False Public USER_RIGHT4 As Boolean = False diff --git a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb index e4f478b..8ea0c4e 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb @@ -162,10 +162,6 @@ Partial Class frmAdministration Me.colSQL_COMMAND = New DevExpress.XtraGrid.Columns.GridColumn() Me.colPREVENT_DUPLICATES = New DevExpress.XtraGrid.Columns.GridColumn() Me.colALLOW_NEW_VALUES = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colADDED_WHO = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colADDED_WHEN = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colCHANGED_WHO = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colCHANGED_WHEN = New DevExpress.XtraGrid.Columns.GridColumn() Me.colDESCRIPTION1 = New DevExpress.XtraGrid.Columns.GridColumn() Me.colACTIVE = New DevExpress.XtraGrid.Columns.GridColumn() Me.PropertyGrid1 = New System.Windows.Forms.PropertyGrid() @@ -1233,7 +1229,7 @@ Partial Class frmAdministration ' 'viewFinalIndex ' - Me.viewFinalIndex.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colPROFIL_ID, Me.colCONNECTION_ID, Me.colINDEXNAME, Me.colVALUE, Me.colSQL_COMMAND, Me.colPREVENT_DUPLICATES, Me.colALLOW_NEW_VALUES, Me.colADDED_WHO, Me.colADDED_WHEN, Me.colCHANGED_WHO, Me.colCHANGED_WHEN, Me.colDESCRIPTION1, Me.colACTIVE}) + Me.viewFinalIndex.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colPROFIL_ID, Me.colCONNECTION_ID, Me.colINDEXNAME, Me.colVALUE, Me.colSQL_COMMAND, Me.colPREVENT_DUPLICATES, Me.colALLOW_NEW_VALUES, Me.colDESCRIPTION1, Me.colACTIVE}) Me.viewFinalIndex.DetailHeight = 295 Me.viewFinalIndex.GridControl = Me.gridFinalIndex Me.viewFinalIndex.Name = "viewFinalIndex" @@ -1286,30 +1282,6 @@ Partial Class frmAdministration Me.colALLOW_NEW_VALUES.FieldName = "ALLOW_NEW_VALUES" Me.colALLOW_NEW_VALUES.Name = "colALLOW_NEW_VALUES" ' - 'colADDED_WHO - ' - resources.ApplyResources(Me.colADDED_WHO, "colADDED_WHO") - Me.colADDED_WHO.FieldName = "ADDED_WHO" - Me.colADDED_WHO.Name = "colADDED_WHO" - ' - 'colADDED_WHEN - ' - resources.ApplyResources(Me.colADDED_WHEN, "colADDED_WHEN") - Me.colADDED_WHEN.FieldName = "ADDED_WHEN" - Me.colADDED_WHEN.Name = "colADDED_WHEN" - ' - 'colCHANGED_WHO - ' - resources.ApplyResources(Me.colCHANGED_WHO, "colCHANGED_WHO") - Me.colCHANGED_WHO.FieldName = "CHANGED_WHO" - Me.colCHANGED_WHO.Name = "colCHANGED_WHO" - ' - 'colCHANGED_WHEN - ' - resources.ApplyResources(Me.colCHANGED_WHEN, "colCHANGED_WHEN") - Me.colCHANGED_WHEN.FieldName = "CHANGED_WHEN" - Me.colCHANGED_WHEN.Name = "colCHANGED_WHEN" - ' 'colDESCRIPTION1 ' Me.colDESCRIPTION1.FieldName = "DESCRIPTION" @@ -2159,10 +2131,6 @@ Partial Class frmAdministration Friend WithEvents colSQL_COMMAND As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colINDEXNAME As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colVALUE As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colADDED_WHO As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colADDED_WHEN As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colCHANGED_WHO As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colCHANGED_WHEN As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colDESCRIPTION1 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colACTIVE As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colPREVENT_DUPLICATES As DevExpress.XtraGrid.Columns.GridColumn diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index 1e5987b..b040a89 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -2504,7 +2504,7 @@ 0, 0 - Windream Index + Index True @@ -2512,6 +2512,9 @@ 0 + + 86 + Fester Wert @@ -2521,6 +2524,9 @@ 2 + + 73 + SQL Befehl @@ -2530,50 +2536,17 @@ 1 + + 150 + Doppelte Werte vermeiden Neue Werte erlauben - - Hinzugefügt Wer - - - True - - - 3 - - - Hinzugefügt Wann - - - True - - - 4 - - - Geändert Wer - - - True - - - 5 - - - Geändert Wann - - - True - - - 6 - - 627, 305 + 627, 308 93 @@ -2600,7 +2573,7 @@ 627, 0 - 323, 305 + 323, 308 91 @@ -2621,7 +2594,7 @@ 3, 166 - 950, 305 + 950, 308 94 @@ -4738,30 +4711,6 @@ DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - colADDED_WHO - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colADDED_WHEN - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colCHANGED_WHO - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - colCHANGED_WHEN - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - colDESCRIPTION1 diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 4fea9c1..70d137f 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -488,7 +488,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAWwBBQFsAQUBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAXQBBQF0AQUBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -541,105 +541,9 @@ 597, 17 - - 500, 134 - - - GridControl_Docs - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 0 - - - BindingNavigator1 - - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 1 - - - NavBarControl1 - - - DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 2 - - - Fill - - - Tahoma, 9pt - - - 0, 158 - - - 1023, 345 - - - 4 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - 637, 95 - - 270, 198 - - - ContextMenuGrid - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 256, 30 - - - 631, 241 - - - 8 - - - GridControl_Docs - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 0 - 269, 26 @@ -720,6 +624,36 @@ Layout speichern + + 270, 198 + + + ContextMenuGrid + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 256, 30 + + + 631, 241 + + + 8 + + + GridControl_Docs + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel1 + + + 0 + 500, 134 @@ -923,6 +857,12 @@ 786, 95 + + 219, 26 + + + Starte Validierung für Profil + 220, 30 @@ -1120,11 +1060,32 @@ 2 - - 219, 26 + + Fill - - Starte Validierung für Profil + + Tahoma, 9pt + + + 0, 158 + + + 1023, 345 + + + 4 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 908, 17 @@ -1132,6 +1093,18 @@ 17, 173 + + 234, 22 + + + Popup Erinnerung inaktivieren + + + 234, 22 + + + Monitor anzeigen + 235, 48 @@ -1313,18 +1286,6 @@ True - - 234, 22 - - - Popup Erinnerung inaktivieren - - - 234, 22 - - - Monitor anzeigen - 17, 56 @@ -1645,6 +1606,18 @@ 0, 0 + + Allgemein + + + Funktionen + + + Verwaltung + + + Grundeinstellungen + Funktionen @@ -1681,18 +1654,6 @@ 5 - - Allgemein - - - Funktionen - - - Verwaltung - - - Grundeinstellungen - RibbonPage2 @@ -1887,7 +1848,7 @@ Manual - Process Manager - Profil-Monitor + 4565465 ImageListProfile diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 341b190..d512b9c 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -582,7 +582,7 @@ Public Class frmMain Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("Layout Dashboard - Error: " & ex.Message) - MsgBox("Unexpected Error in Layout Dashboard - Error: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + MsgBox("Unexpected Error in Layout Dashboard - Error: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, ADDITIONAL_TITLE) End Try End Sub Private Function Create_Series(title As String, type As String) As Series @@ -1148,13 +1148,13 @@ Public Class frmMain End If Else - MsgBox("Could not get the ProfileID of file! - Check Your configuration of MainView!", MsgBoxStyle.Critical) + MsgBox("Could not get the ProfileID of file! - Check Your configuration of MainView!", MsgBoxStyle.Critical, ADDITIONAL_TITLE) End If Catch ex As Exception LOGGER.Error(ex) allgFunk.Insert_LogEntry($"{ex.Message} - Stack: [{ex.StackTrace}]") - MsgBox("Unexpected error in Item_Scope: " & ex.Message & vbNewLine & "Choose file again!", MsgBoxStyle.Information) + MsgBox("Unexpected error in Item_Scope: " & ex.Message & vbNewLine & "Choose file again!", MsgBoxStyle.Information, ADDITIONAL_TITLE) End Try End Sub Private Function Init_IDB() @@ -1283,11 +1283,6 @@ Public Class frmMain Load_Grid_Overview() RefreshHelper.LoadViewInfo() End Sub - Private Sub GridView1_PopupMenuShowing(ByVal sender As Object, ByVal e As DevExpress.XtraGrid.Views.Grid.PopupMenuShowingEventArgs) - Dim view As GridView = TryCast(sender, GridView) - MsgBox(e.MenuType.ToString) - - End Sub Sub Load_Grid_Overview() SplitContainerDashboard.Visible = False Layout_Single_Profile() @@ -1498,7 +1493,7 @@ Public Class frmMain If CURRENT_CLICKED_PROFILE_ID <> 0 Then Load_Profil_from_Grid(CURRENT_CLICKED_PROFILE_ID) Else - MsgBox("Bitte wählen Sie zuerst ein Profil aus!", MsgBoxResult.Ok) + MsgBox("Please choose a profile!", MsgBoxResult.Ok, ADDITIONAL_TITLE) End If End Sub @@ -1663,11 +1658,8 @@ Public Class frmMain Else RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Default End If - If ADDITIONAL_TITLE <> String.Empty Then - Me.Text = ADDITIONAL_TITLE - Else - Me.Text = "Process Manager" - End If + LOGGER.Debug($" RibbonControl1.ColorScheme [{RIBBON_COLOR_SCHEME}]") + Me.Text = ADDITIONAL_TITLE End Sub Sub Handling_DEBUG_USER() @@ -1724,7 +1716,7 @@ Public Class frmMain omsg = omsg.Replace(Chr(10), "") omsg = omsg.Replace(Chr(13), "") Dim odatetime As Date = CDate(oLogSplit(0)) - oSQL = $"INSERT INTO [dbo].[TBPM_LOG_DEBUG] ([USERID] , [LOGMSG], [ADDED_WHEN]) VALUES({USER_ID},'{omsg}','{odatetime}')" + oSQL = $"INSERT INTO [dbo].[TBPM_LOG_DEBUG] ([USERID] , [LOGMSG], [ADDED_WHEN],DATE_STR) VALUES({USER_ID},'{omsg}',GetDate(),'{odatetime}')" ClassDatabase.Execute_non_Query(oSQL) Next LOGCONFIG.ClearLogs() @@ -1735,7 +1727,7 @@ Public Class frmMain End Sub Private Sub tsslblDEBUG_LOG_MouseHover(sender As Object, e As EventArgs) - MsgBox("UserDebugMode is activated remotely. Debugdata will be transferred to database and will be deleted after 10 days!!", MsgBoxStyle.Information) + MsgBox("UserDebugMode is activated remotely. Debugdata will be transferred to database and will be deleted after 10 days!!", MsgBoxStyle.Information, ADDITIONAL_TITLE) End Sub diff --git a/app/DD_PM_WINDREAM/frmMonitor.vb b/app/DD_PM_WINDREAM/frmMonitor.vb index f347768..19996f0 100644 --- a/app/DD_PM_WINDREAM/frmMonitor.vb +++ b/app/DD_PM_WINDREAM/frmMonitor.vb @@ -107,6 +107,8 @@ Public Class frmMonitor DocumentViewerMonitor.LoadFile(oDocPath) BarStaticItemInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never DocumentViewerMonitor.Visible = True + DocumentViewerMonitor.RightOnlyView(USER_RIGHT_VIEW_ONLY) + Else BarStaticItemInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Always BarStaticItemInfo.Caption = $"File is not existing or accessible!" diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index 1df6f16..14bcd29 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -30,6 +30,7 @@ Partial Class frmValidator Me.btnSave = New System.Windows.Forms.Button() Me.DESCRIPTIONLabel = New System.Windows.Forms.Label() Me.pnldesigner = New System.Windows.Forms.Panel() + Me.DocumentViewerValidator = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.BarAndDockingController3 = New DevExpress.XtraBars.BarAndDockingController(Me.components) Me.BarAndDockingController2 = New DevExpress.XtraBars.BarAndDockingController(Me.components) Me.BarAndDockingController1 = New DevExpress.XtraBars.BarAndDockingController(Me.components) @@ -84,7 +85,7 @@ Partial Class frmValidator Me.bsiError = New DevExpress.XtraBars.BarStaticItem() Me.bsiInformation = New DevExpress.XtraBars.BarStaticItem() Me.bsiDocID = New DevExpress.XtraBars.BarStaticItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItemFileView = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() Me.bbtniRefresh = New DevExpress.XtraBars.BarButtonItem() @@ -95,12 +96,11 @@ Partial Class frmValidator Me.bsiInfo1 = New DevExpress.XtraBars.BarStaticItem() Me.bsiInfo2 = New DevExpress.XtraBars.BarStaticItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageFile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.DocumentViewerValidator = New DigitalData.Controls.DocumentViewer.DocumentViewer() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() @@ -171,6 +171,11 @@ Partial Class frmValidator Me.pnldesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.pnldesigner.Name = "pnldesigner" ' + 'DocumentViewerValidator + ' + resources.ApplyResources(Me.DocumentViewerValidator, "DocumentViewerValidator") + Me.DocumentViewerValidator.Name = "DocumentViewerValidator" + ' 'BarAndDockingController3 ' Me.BarAndDockingController3.PropertiesBar.AllowLinkLighting = False @@ -504,7 +509,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.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2}) + 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}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 16 Me.RibbonControl1.Name = "RibbonControl1" @@ -533,13 +538,13 @@ Partial Class frmValidator Me.bsiDocID.Id = 3 Me.bsiDocID.Name = "bsiDocID" ' - 'BarButtonItem2 + 'BarButtonItemFileView ' - resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") - Me.BarButtonItem2.Id = 4 - Me.BarButtonItem2.ImageOptions.Image = CType(resources.GetObject("BarButtonItem2.ImageOptions.Image"), System.Drawing.Image) - Me.BarButtonItem2.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImage"), System.Drawing.Image) - Me.BarButtonItem2.Name = "BarButtonItem2" + resources.ApplyResources(Me.BarButtonItemFileView, "BarButtonItemFileView") + Me.BarButtonItemFileView.Id = 4 + Me.BarButtonItemFileView.ImageOptions.Image = CType(resources.GetObject("BarButtonItem2.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItemFileView.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonItemFileView.Name = "BarButtonItemFileView" ' 'BarButtonItem3 ' @@ -627,18 +632,18 @@ Partial Class frmValidator ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageFile, Me.RibbonPageGroup3, Me.RibbonPageGroup2}) Me.RibbonPage1.Name = "RibbonPage1" resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") ' - 'RibbonPageGroup1 + 'RibbonPageFile ' - Me.RibbonPageGroup1.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem4) - Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") + Me.RibbonPageFile.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageFile.ItemLinks.Add(Me.BarButtonItemFileView) + Me.RibbonPageFile.ItemLinks.Add(Me.BarButtonItem3) + Me.RibbonPageFile.ItemLinks.Add(Me.BarButtonItem4) + Me.RibbonPageFile.Name = "RibbonPageFile" + resources.ApplyResources(Me.RibbonPageFile, "RibbonPageFile") ' 'RibbonPageGroup3 ' @@ -674,11 +679,6 @@ Partial Class frmValidator Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' - 'DocumentViewerValidator - ' - resources.ApplyResources(Me.DocumentViewerValidator, "DocumentViewerValidator") - Me.DocumentViewerValidator.Name = "DocumentViewerValidator" - ' 'frmValidator ' Me.Appearance.Options.UseFont = True @@ -779,13 +779,13 @@ Partial Class frmValidator Friend WithEvents ToolTip1 As ToolTip Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageFile As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents bsiError As DevExpress.XtraBars.BarStaticItem Friend WithEvents bsiInformation As DevExpress.XtraBars.BarStaticItem Friend WithEvents bsiDocID As DevExpress.XtraBars.BarStaticItem - Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItemFileView As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index f0b7eb3..c58d8c6 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -123,7 +123,7 @@ - 0, 158 + 0, 146 Top, Left, Right @@ -172,7 +172,7 @@ MiddleLeft - 7, 404 + 7, 419 3, 4, 3, 4 @@ -238,7 +238,7 @@ 3, 4, 3, 4 - 466, 311 + 466, 326 18 @@ -265,7 +265,7 @@ 3, 4, 3, 4 - 477, 461 + 477, 476 24 @@ -304,7 +304,7 @@ 3, 4, 3, 4 - 481, 461 + 481, 476 0 @@ -334,7 +334,7 @@ 1 - 962, 461 + 962, 476 477 @@ -507,7 +507,7 @@ BarStaticItem1 - + Datei öffnen @@ -846,7 +846,7 @@ 0, 0 - + Datei @@ -872,13 +872,13 @@ Menü - 962, 158 + 962, 146 - 0, 619 + 0, 622 - 962, 24 + 962, 21 RibbonStatusBar1 @@ -1420,10 +1420,10 @@ DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItem2 + + BarButtonItemFileView - + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -1486,10 +1486,10 @@ DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup1 + + RibbonPageFile - + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index b987656..3bb179e 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -523,7 +523,7 @@ Public Class frmValidator Next Catch ex As Exception LOGGER.Error(ex) - MsgBox("Error in LoadSQLData: " & ex.Message, MsgBoxStyle.Critical) + MsgBox("Error in LoadSQLData: " & ex.Message, MsgBoxStyle.Critical, ADDITIONAL_TITLE) clsLogger.Add("Error in LoadSQLData: " & ex.Message) End Try End Sub @@ -560,7 +560,7 @@ Public Class frmValidator oDTforControl = ClassDatabase.Return_Datatable_ConId(oSql, oConnectionId) If IsNothing(oDTforControl) Then - MsgBox($"SQL-Query for control {control.Name} is invalid.") + MsgBox($"SQL-Query for control {control.Name} is invalid.", MsgBoxStyle.OkOnly, ADDITIONAL_TITLE) Exit Sub End If Dim oValue @@ -635,7 +635,7 @@ Public Class frmValidator Next Catch ex As Exception LOGGER.Error(ex) - MsgBox("Error in LoadSQLData2: " & ex.Message, MsgBoxStyle.Critical) + MsgBox("Error in LoadSQLData2: " & ex.Message, MsgBoxStyle.Critical, ADDITIONAL_TITLE) clsLogger.Add("Error in LoadSQLData2: " & ex.Message) End Try End Sub @@ -1126,10 +1126,10 @@ Public Class frmValidator Override_SQLCommand = clsPatterns.ReplaceAllValues(Override_SQLCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) Dim oDT_ACTIONS As DataTable = ClassDatabase.Return_Datatable(oSQL) If IsNothing(oDT_ACTIONS) Then - MsgBox("Something went wrong in custom action - Please check Your log!", MsgBoxStyle.Exclamation) + MsgBox("Something went wrong in custom action - Please check Your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) Exit Sub ElseIf oDT_ACTIONS.Rows.Count = 0 Then - MsgBox("Something went wrong in custom action (No row) - Please check Your log!", MsgBoxStyle.Exclamation) + MsgBox("Something went wrong in custom action (No row) - Please check Your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) Exit Sub End If 'Select Case'Override' as Action_Type, 'Sind Sie sicher dass Sie nicht zuständig sind?' as Question,'Nicht Zuständig' as Caption,'Red' as Color @@ -1211,7 +1211,7 @@ Public Class frmValidator If oREsult = True Then Reload_Controls(oControlName) Else - MsgBox("Unexpected error in Button Refresh_Controls - Check Your log!", MsgBoxStyle.Exclamation) + MsgBox("Unexpected error in Button Refresh_Controls - Check Your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) End If End If Case "Update_Controls".ToUpper @@ -1227,7 +1227,7 @@ Public Class frmValidator StatusLabel("Refreshed single control") FillIndexValues(False) Else - MsgBox("Unexpected error in Button Refresh_Controls - Check Your log!", MsgBoxStyle.Exclamation) + MsgBox("Unexpected error in Button Refresh_Controls - Check Your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) End If End If @@ -1236,7 +1236,7 @@ Public Class frmValidator Override = True Finish_WFStep() Case Else - MsgBox($"No configured action provided for onCustomButtonClick [{oAction}]", MsgBoxStyle.Exclamation, "") + MsgBox($"No configured action provided for onCustomButtonClick [{oAction}]", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) LOGGER.Warn($"No configured action provided for onCustomButtonClick [{oAction}]") End Select @@ -1714,7 +1714,7 @@ Public Class frmValidator Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("Unexpected Error in Depending_Control_Set_Result - ERROR: " & ex.Message) - MsgBox("Unexpected error: " & ex.Message, MsgBoxStyle.Critical) + MsgBox("Unexpected error: " & ex.Message, MsgBoxStyle.Critical, ADDITIONAL_TITLE) End Try End Sub Public Sub OnDTPValueChanged(sender As System.Object, e As System.EventArgs) @@ -1940,7 +1940,7 @@ Public Class frmValidator LOGGER.Debug("Dokument-GUID: '" & CURRENT_DOC_GUID.ToString & "'") If CURRENT_DOC_GUID > 0 Then If GetWMDocPathWindows(0) = False Then - MsgBox("Could not access the file! Check the log!", MsgBoxStyle.Critical, "") + MsgBox("Could not access the file! Check the log!", MsgBoxStyle.Critical, ADDITIONAL_TITLE) Exit Sub End If If IDB_ACTIVE = False Then @@ -2045,7 +2045,7 @@ Public Class frmValidator Try MsgBox(oROW.Item("STRING1"), MsgBoxStyle.Information, oROW.Item("STRING2")) Catch ex As Exception - MsgBox("No more documents!" & vbNewLine & "Form will be closed now!", MsgBoxStyle.Information, "") + MsgBox("No more documents!" & vbNewLine & "Form will be closed now!", MsgBoxStyle.Information, ADDITIONAL_TITLE) End Try activate_controls(True) Me.Close() @@ -2063,6 +2063,12 @@ Public Class frmValidator End Sub Sub load_viewer() DocumentViewerValidator.LoadFile(WMDocPathWindows) + DocumentViewerValidator.RightOnlyView(USER_RIGHT_VIEW_ONLY) + If USER_RIGHT_VIEW_ONLY = True Then + RibbonPageFile.Visible = False + Else + RibbonPageFile.Visible = True + End If SplitContainer1.Panel2Collapsed = False End Sub @@ -2344,7 +2350,7 @@ Public Class frmValidator Return value Catch ex As Exception LOGGER.Error(ex) - MsgBox("error in ReturnVektor_IndexValue: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + MsgBox("error in ReturnVektor_IndexValue: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, ADDITIONAL_TITLE) LOGGER.Info("error in ReturnVektor_IndexValue: " & ex.Message) Return "" End Try @@ -2561,7 +2567,7 @@ Public Class frmValidator oControlType = "DataGridView" Dim dgv As DataGridView = oControl If oSourceIndexName = "" Then - MsgBox("Attention wrong configuration:" & vbNewLine & "for control " & oControl.Name & " no INDEX configured!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) + MsgBox("Attention wrong configuration:" & vbNewLine & "for control " & oControl.Name & " no INDEX configured!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical, ADDITIONAL_TITLE) Exit For End If If oSourceIndexName Is Nothing = False Then @@ -2579,7 +2585,7 @@ Public Class frmValidator 'Tabellendarstellung Case "TABLE" - Dim dt As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = " & oControlId) + Dim dt As DataTable = ClassDatabase.Return_Datatable($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {oControlId} ORDER BY [SEQUENCE]") Dim SpaltenWerte As String() LOGGER.Debug($"{dt.Rows.Count} Columns configured for control {oControlId}.") If dt.Rows.Count > 1 Then @@ -2638,7 +2644,7 @@ Public Class frmValidator oControlType = "DevExpress.XtraGrid.GridControl" Dim oMyGridControl As GridControl = oControl If oSourceIndexName = "" Then - MsgBox("Attention wrong configuration:" & vbNewLine & "for control " & oControl.Name & " no INDEX configured!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) + MsgBox("Attention wrong configuration:" & vbNewLine & "for control " & oControl.Name & " no INDEX configured!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical, ADDITIONAL_TITLE) Exit For End If If oSourceIndexName Is Nothing = False Then @@ -2658,7 +2664,7 @@ Public Class frmValidator Select Case oTyp 'Tabellendarstellung Case "TABLE" - Dim dt As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = " & oControlId) + Dim dt As DataTable = ClassDatabase.Return_Datatable($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {oControlId} ORDER BY [SEQUENCE]") Dim oColCount = dt.Rows.Count Dim oColValuesfromSource As String() LOGGER.Debug($"DevExpressGrid: {oColCount} Columns configured for control {oControlId}.") @@ -2816,7 +2822,7 @@ Public Class frmValidator LOGGER.Debug("Loading checkbox.") oControlType = "CheckBox" If oSourceIndexName = "" Then - MsgBox("Attention wrong configuration:" & vbNewLine & "for control " & oControl.Name & " no INDEX configured!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) + MsgBox("Attention wrong configuration:" & vbNewLine & "for control " & oControl.Name & " no INDEX configured!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical, ADDITIONAL_TITLE) Exit For End If If oSourceIndexName Is Nothing = False Then @@ -2962,7 +2968,7 @@ Public Class frmValidator oControlType = "DateTimePicker" Dim DTP As DateTimePicker = oControl If oSourceIndexName = "" Then - MsgBox("Attention wrong configuration:" & vbNewLine & "for control " & oControl.Name & " no INDEX configured!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical) + MsgBox("Attention wrong configuration:" & vbNewLine & "for control " & oControl.Name & " no INDEX configured!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical, ADDITIONAL_TITLE) Exit For End If If oSourceIndexName Is Nothing = False Then @@ -3158,10 +3164,10 @@ Public Class frmValidator Dim oDT_ACTIONS As DataTable = ClassDatabase.Return_Datatable(oSQL) If IsNothing(oDT_ACTIONS) Then - MsgBox("Something went wrong in btnFinish_continue - Please check Your log and inform the workflow-team!", MsgBoxStyle.Exclamation) + MsgBox("Something went wrong in btnFinish_continue - Please check Your log and inform the workflow-team!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) Return False ElseIf oDT_ACTIONS.Rows.Count = 0 Then - MsgBox("Something went wrong in btnFinish_continue (No row) - Please check Your log and inform the workflow-team!", MsgBoxStyle.Exclamation) + MsgBox("Something went wrong in btnFinish_continue (No row) - Please check Your log and inform the workflow-team!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) Return False End If 'Select Case'Override' as Action_Type, 'Sind Sie sicher dass Sie nicht zuständig sind?' as Question,'Nicht Zuständig' as Caption,'Red' as Color @@ -3520,7 +3526,7 @@ Public Class frmValidator End If End If If oErrorOcurred = True Then - MsgBox("Unhandled error occured ... please check your log!", MsgBoxStyle.Exclamation) + MsgBox("Unhandled error occured ... please check your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) ItemWorked = False Else 'Das Dokument freigeben und as editiert markieren @@ -3661,6 +3667,8 @@ Public Class frmValidator Dim oRegexMessage As String = NotNull(dr.Item("REGEX_MESSAGE_DE"), String.Empty) oControlName = dr.Item("CTRL_NAME") Dim oOVERWRITE_DATA = dr.Item("OVERWRITE_DATA") + Dim oPreventMultipleValues = dr.Item("VKT_PREVENT_MULTIPLE_VALUES") + 'Nur wenn der Name der Zeile entspricht und der Index READ_ONLY FALSE ist If dr.Item("CTRL_NAME") = oControl.Name And (oIsReadOnly = False Or oSQLCheckCommand <> "") And oIndexName <> "DD PM-ONLY FOR DISPLAY" Then LOGGER.Debug("Indexierung für Control (" & oControlId & ") '" & oControlName & "' gestartet. Indexname '" & oIndexName & "'") @@ -3708,14 +3716,12 @@ Public Class frmValidator Else Dim oMyDT = DT_FOR_ARRAY(myVektorArr) - If IDBData.SetVariableValue(oIndexName, oMyDT, oOVERWRITE_DATA) = False Then + If IDBData.SetVariableValue(oIndexName, oMyDT, oOVERWRITE_DATA, oIDBTyp) = False Then oMissing = True oErrorMessage = "Error while indexing IDB-Object LookupGrid" Exit For End If End If - 'Jetzt die Datei indexieren - Else Dim oValues As New List(Of Object) From {String.Empty} If IDB_ACTIVE = False Then @@ -4686,7 +4692,7 @@ Public Class frmValidator bsiInformation.Caption = infotext & " " & Now.ToString End Sub - Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemFileView.ItemClick Try Dim Proc As New System.Diagnostics.Process Dim psi As New ProcessStartInfo(WMDocPathWindows) diff --git a/app/DD_PM_WINDREAM/frmValidatorSearch.vb b/app/DD_PM_WINDREAM/frmValidatorSearch.vb index 070a996..dbae7d0 100644 --- a/app/DD_PM_WINDREAM/frmValidatorSearch.vb +++ b/app/DD_PM_WINDREAM/frmValidatorSearch.vb @@ -469,6 +469,12 @@ Public Class frmValidatorSearch 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.RightOnlyView(USER_RIGHT_VIEW_ONLY) + If USER_RIGHT_VIEW_ONLY = True Then + ToolStripDropDownButtonFile.Visible = False + Else + ToolStripDropDownButtonFile.Visible = True + End If End If End If