From f55a7bdfc32d75e5f935b4a476146a190e705a87 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Fri, 14 Oct 2022 10:09:43 +0200 Subject: [PATCH] MS Languages --- .../ClassAllgemeineFunktionen.vb | 9 +- app/DD_PM_WINDREAM/ClassIDBData.vb | 6 +- app/DD_PM_WINDREAM/ClassInit.vb | 2 +- app/DD_PM_WINDREAM/ClassParamRefresh.vb | 2 + app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb | 2 + app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 2 +- app/DD_PM_WINDREAM/frmMain.resx | 4 +- app/DD_PM_WINDREAM/frmMain.vb | 135 ++----- app/DD_PM_WINDREAM/frmValidator.resx | 364 ++++++++---------- app/DD_PM_WINDREAM/frmValidator.vb | 28 +- 10 files changed, 228 insertions(+), 326 deletions(-) diff --git a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb index c296840..224f056 100644 --- a/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb +++ b/app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb @@ -21,7 +21,14 @@ Public Class ClassAllgemeineFunktionen End If Else - Return oFilteredDatatable + If oFilteredDatatable.Rows.Count = 0 Then 'KEIN EINTRAG FÜR SPRACHE + oExpression = $"LANGUAGE ='de-DE' AND TITLE = '{pTITLE}'" + BASEDATA_DT_GUI_LANGUAGE_PHRASES.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges) + Return oFilteredDatatable.Rows(0).Item("STRING1") + Else + Return oFilteredDatatable + End If + End If End Function Public Shared Function GUI_LANGUAGE_MSGBOX(pTITLE As String) diff --git a/app/DD_PM_WINDREAM/ClassIDBData.vb b/app/DD_PM_WINDREAM/ClassIDBData.vb index 0a90678..fa7adf2 100644 --- a/app/DD_PM_WINDREAM/ClassIDBData.vb +++ b/app/DD_PM_WINDREAM/ClassIDBData.vb @@ -92,7 +92,7 @@ oSingleAttribute = False End Select Dim oAttributeValue - + LOGGER.Debug($"IDBData - GetVariableValue - oSingleAttribute [{oSingleAttribute.ToString}] - FromIDB [{FromIDB.ToString}]") If oSingleAttribute = True And IDB_DT_DOC_DATA.Rows.Count = 1 And FromIDB = False Then Try If oAttributeName = "IDBCreatedWhen" Then @@ -104,7 +104,7 @@ ElseIf oAttributeName = "IDBChangedWho" Then oAttributeName = "CHANGED_WHO" End If - + LOGGER.Debug($"IDBData - GetVariableValue - IDB_DT_DOC_DATA.Rows.Count = 1") oAttributeValue = IDB_DT_DOC_DATA.Rows(0).Item(oAttributeName) Catch ex As Exception LOGGER.Debug($"Error getting Attribute from IDB_DT_DOC_DATA: {ex.Message}") @@ -112,11 +112,13 @@ End If If Not IsNothing(oAttributeValue) Then + LOGGER.Debug($"IDBData - GetVariableValue - Returning value: [{oAttributeValue}]") Return oAttributeValue Else 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}'))" + LOGGER.Debug($"GetVariableValue: {oFNSQL}") oAttributeValue = DatabaseFallback.GetDatatableIDB(oFNSQL) Dim odt As DataTable = oAttributeValue If odt.Rows.Count = 1 Then diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index 799f4b3..522026a 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -455,7 +455,7 @@ Public Class ClassInit BASEDATA_DT_TBDD_SQL_COMMANDS = DatabaseFallback.GetDatatable("TBDD_SQL_COMMANDS", New GetDatatableOptions(oSql, DatabaseType.ECM)) oStep = "TBDD_GUI_LANGUAGE_PHRASE" - oSql = "SELECT * FROM TBDD_GUI_LANGUAGE_PHRASE WHERE MODULE IN ('PM','All Modules')" + oSql = $"SELECT * FROM TBDD_GUI_LANGUAGE_PHRASE WHERE MODULE IN ('PM','All Modules') and LANGUAGE = '{USER_LANGUAGE}'" 'BASEDATA_DT_GUI_LANGUAGE_PHRASES = DataASorDB.GetDatatable("DD_ECM", oSql, "TBDD_GUI_LANGUAGE_PHRASE", "") BASEDATA_DT_GUI_LANGUAGE_PHRASES = DatabaseFallback.GetDatatable("TBDD_GUI_LANGUAGE_PHRASE", New GetDatatableOptions(oSql, DatabaseType.ECM)) diff --git a/app/DD_PM_WINDREAM/ClassParamRefresh.vb b/app/DD_PM_WINDREAM/ClassParamRefresh.vb index 632dbda..39a2ad3 100644 --- a/app/DD_PM_WINDREAM/ClassParamRefresh.vb +++ b/app/DD_PM_WINDREAM/ClassParamRefresh.vb @@ -14,6 +14,8 @@ Public Class ClassParamRefresh Dim oSQL = oRow.Item("SQL_COMMAND") USERCOUNT_LOGGED_IN = DatabaseFallback.GetScalarValueECM(oSQL) oLicenseoverSQL = True + ElseIf oRow.Item("TITLE") = "PM_PROFILES_USER" Then + SQL_PROFILES_USER = oRow.Item("SQL_COMMAND") End If Next End If diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index 67aa0d2..5b8732a 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -169,4 +169,6 @@ Module ModuleRuntimeVariables Public Property Timer5Mins_running As Boolean = False Public Property TimerRefresh_running As Boolean = False + + Public Property SQL_PROFILES_USER As String = "" End Module diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index a575637..56ec89a 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/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index f0e4122..4330b1f 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAARQBCQEUAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAASQBCQEkAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1793,7 +1793,7 @@ True - 198 + 63 9, 19 diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index ddd2bfa..9cab8dc 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -54,7 +54,8 @@ Public Class frmMain Private FRONTEND_ACTION As String = "NONE" Private Ev_Filter_Panel_Closed As Boolean = False Dim omsgOpenWorkflow = "Bitte schliessen Sie den offenen Workflow!" - Dim omsgTitleWarning = "Achtung:" + Dim omsgTitleWarning As String + Dim omsgTitleAttention As String Private Const FullFilepatColName = "FULL_FILE_PATH" Private Const FA_NONE = "NONE" Private Function GET_LAST_ADDED(pDatatable As DataTable) As String @@ -165,11 +166,9 @@ Public Class frmMain ' Create helper to save/load expanded GroupColumns at runtime RefreshHelper = New RefreshHelper(LOGCONFIG, GridViewWFItems, "GUID") - - If User.Language <> "de-DE" Then - omsgOpenWorkflow = "Please close the active workflow!" - omsgTitleWarning = "Warning:" - End If + omsgOpenWorkflow = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("WorkflowIsActive1") + omsgTitleWarning = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("MsgboxTitleWarning") + omsgTitleAttention = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("MsgboxTitleAttention") Dim oVErsion = String.Format("{0}.{1}.{2}", My.Application.Info.Version.Major, My.Application.Info.Version.Minor, My.Application.Info.Version.Build) @@ -235,12 +234,10 @@ Public Class frmMain If USER_IS_ADMIN = True Then RibbonPageGroup3.Visible = True 'Anzahl der eingeloggten User + bsiUserLoggedIn.Visibility = DevExpress.XtraBars.BarItemVisibility.Always - If USER_LANGUAGE <> "de-DE" Then - bsiUserLoggedIn.Caption = "License Count: " & USERCOUNT_LOGGED_IN - Else - bsiUserLoggedIn.Caption = "Lizenz-Zähler: " & USERCOUNT_LOGGED_IN - End If + Dim oCaption As String = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("LicenseCountCaption") + bsiUserLoggedIn.Caption = $"{oCaption} {USERCOUNT_LOGGED_IN}" If GHOSTMODE_ACTIVE = True Then bbtnitmGhostMode.Visibility = DevExpress.XtraBars.BarItemVisibility.Always Else @@ -987,15 +984,8 @@ Public Class frmMain bindsourcegrid.DataSource = CURR_DT_OVERVIEW GridControl_Docs.DataSource = bindsourcegrid Dim objectCount_Descr = GridViewWFItems.RowCount.ToString - If USER_LANGUAGE = "de-DE" Then - objectCount_Descr &= " Vorgänge" - Else - objectCount_Descr &= " objects" - End If - - 'tslblObjectCount.Text = objectCount_Descr - - 'GridControlDocRow.ForceInitialize() + Dim ocapt = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("DescItems") + objectCount_Descr = $"{objectCount_Descr} {ocapt}" RestoreLayout() @@ -1186,11 +1176,7 @@ Public Class frmMain Exit Sub End If - If USER_LANGUAGE <> "de-DE" Then - bsilastsync.Caption = "Last Client-Sync: " & Now.ToLongTimeString - Else - bsilastsync.Caption = "Letzte Synchronisation: " & Now.ToLongTimeString - End If + bsilastsync.Caption = $"{ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("CaptLastSync")}: " & Now.ToLongTimeString If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.SaveViewInfo() @@ -1353,12 +1339,8 @@ Public Class frmMain Try CURRENT_ProfilGUID = pProfilID - Dim omsg = "Es ist bereits ein Workflow geöffnet!" - Dim omsgTitle = "Achtung:" - If USER_LANGUAGE <> "de-DE" Then - omsg = "There is already a workflow active!" - omsgTitle = "Attention:" - End If + Dim omsg = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("WorkflowIsActive2") + ' Dim th As System.Threading.Thread If Not Application.OpenForms().OfType(Of frmValidator).Any Then @@ -1427,7 +1409,7 @@ Public Class frmMain ' th.Start() Else LOGGER.Debug("Validator is already open...") - FormHelper.ShowInfoMessage(omsg, omsgTitleWarning) + FormHelper.ShowInfoMessage(omsg, omsgTitleAttention) End If @@ -1679,13 +1661,8 @@ Public Class frmMain If CBool(oResult) = True Then Load_Profil_from_Grid(CURRENT_CLICKED_PROFILE_ID) Else - Dim omsg As String = "Achtung: der gewählte Beleg ist durch einen anderen Benutzer bereits in Bearbeitung oder anderweitig gesperrt" - Dim otitle = "Achtung:" - If USER_LANGUAGE <> "de-DE" Then - omsg = "Attention: the item You chose is rather in work or locked from another user!" - otitle = "Attention:" - End If - FormHelper.ShowInfoMessage(omsg, omsgTitleWarning) + Dim omsg = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("WFInWork") + FormHelper.ShowInfoMessage(omsg, omsgTitleAttention) End If Catch ex As Exception @@ -1869,11 +1846,9 @@ Public Class frmMain NO_WORKFLOWITEMS = False If CURR_DT_OVERVIEW.Rows.Count = 0 Then - If USER_LANGUAGE = "de-DE" Then - GridViewWFItems.ViewCaption = "Aktuell keine Workflowdaten vorhanden!" - Else - GridViewWFItems.ViewCaption = "No workflowdata!" - End If + + GridViewWFItems.ViewCaption = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("NoWorkflowData") + NO_WORKFLOWITEMS = True GridControl_Docs.Visible = False bindsourcegrid.DataSource = Nothing @@ -2265,7 +2240,12 @@ Public Class frmMain End If If pMode = "bwBasicData" Then bwBasicData.ReportProgress(20) - oSQL = String.Format("SELECT T.* FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_GET_ACTIVE_PROFILES_USER] ({0}))", USER_ID) + If SQL_PROFILES_USER <> "" Then + oSQL = SQL_PROFILES_USER.Replace("@USER_ID", USER_ID) + Else + oSQL = String.Format("SELECT T.* FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_GET_ACTIVE_PROFILES_USER] ({0}))", USER_ID) + End If + CURR_DT_VWPM_PROFILE_ACTIVE = DatabaseFallback.GetDatatableECM(oSQL) If pMode = "bwBasicData" Then bwBasicData.ReportProgress(30) LoadCURRENT_DT_PROFILES() @@ -2351,11 +2331,7 @@ Public Class frmMain End Sub Sub Handling_DEBUG_USER() If DEBUG = True Then - If USER_LANGUAGE = "de-DE" Then - bsiDebug.Caption = "HINWEIS: UserDebugMode ist eingeschaltet!" - Else - bsiDebug.Caption = "INFORMATION: UserDebugMode activated!" - End If + bsiDebug.Caption = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("DebugModeActive") bsiDebug.Visibility = DevExpress.XtraBars.BarItemVisibility.Always Else bsiDebug.Visibility = DevExpress.XtraBars.BarItemVisibility.Never @@ -2538,12 +2514,7 @@ Public Class frmMain Private Sub bwBasicData_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) Handles bwBasicData.RunWorkerCompleted If USER_IS_ADMIN Then - If USER_LANGUAGE = "de-DE" Then - bsiUserLoggedIn.Caption = "License Count: " & USERCOUNT_LOGGED_IN - Else - bsiUserLoggedIn.Caption = "Lizenz-Zähler: " & USERCOUNT_LOGGED_IN - End If - + bsiDebug.Caption = $"{ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("LicenseCountCaption")}: {USERCOUNT_LOGGED_IN}" End If BarEditItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End Sub @@ -2626,13 +2597,7 @@ Public Class frmMain frmGhostMode.ShowDialog() If USER_GHOST_MODE_ACTIVE = True And USER_GHOST_MODE_USRNAME <> String.Empty Then LOGGER.Info($"GHOST MODE for User {USER_GHOST_MODE_USRNAME} will now be initialized!") - If USER_LANGUAGE = "de-DE" Then - BarButtonItemGhostMode.Caption = $"Ghost Modus ({USER_GHOST_MODE_USRNAME}) inaktivieren" - Else - BarButtonItemGhostMode.Caption = $"Inactivate ghost mode ({USER_GHOST_MODE_USRNAME})" - End If - - + BarButtonItemGhostMode.Caption = $"{ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("CaptionDeactivateDebugMode")} ({USER_GHOST_MODE_USRNAME})" BarButtonItemGhostMode.Visibility = DevExpress.XtraBars.BarItemVisibility.Always _Init.InitBasics() _Init.InitUserLogin(USER_GHOST_MODE_USRNAME) @@ -2649,6 +2614,7 @@ Public Class frmMain USER_GHOST_MODE_USRNAME = String.Empty BarButtonItemGhostMode.Visibility = DevExpress.XtraBars.BarItemVisibility.Never _Init.InitUserLogin() + GetBaseData("InactivateGM") LoadNavBar() Await Decide_Load(False) If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.LoadViewInfo() @@ -2663,12 +2629,8 @@ Public Class frmMain Timer_Inactivity_Reset_Disable("GridView_Docs.ColumnFilterChanged") Create_View_Caption() If Ev_Filter_Panel_Closed = False Then - Dim objectCount_Descr As String ' = GridViewWFItems.RowCount.ToString - If USER_LANGUAGE <> "de-DE" Then - objectCount_Descr = " filtered" - Else - objectCount_Descr = " Filter aktiv" - End If + Dim objectCount_Descr As String = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("DescFilterActive") + GridViewWFItems.ViewCaption += $"|{objectCount_Descr}" Else Ev_Filter_Panel_Closed = False @@ -2699,11 +2661,8 @@ Public Class frmMain oRowCount = oRowCount '- oGroupCount Dim objectCount_Descr = $"[{oRowCount.ToString}]" - If USER_LANGUAGE = "de-DE" Then - objectCount_Descr &= " Workflows" - Else - objectCount_Descr &= " workflows" - End If + objectCount_Descr = $"{objectCount_Descr} {ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("Workflows")}" + bsiRowCount.Caption = objectCount_Descr Catch ex As Exception bsiRowCount.Caption = "Error getting RowCount" @@ -2712,13 +2671,7 @@ Public Class frmMain End Sub Sub Create_View_Caption() Try - - If USER_LANGUAGE = "de-DE" Then - GridViewWFItems.ViewCaption = "Gesamtübersicht" - Else - GridViewWFItems.ViewCaption = "Overview" - End If - + GridViewWFItems.ViewCaption = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("GridViewWFItems.ViewCaption") Catch ex As Exception End Try @@ -2770,11 +2723,10 @@ Public Class frmMain Exit Sub 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 have been logged out automatically." - End If + Dim omsg As String = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("INACTIVITYRecognized") + + Timer5Mins.Stop() TimerRefresh.Stop() TimerReminder.Stop() @@ -2924,11 +2876,7 @@ Public Class frmMain Dim oProfileId = 0 If oSelectedRows.Count = 0 Then - Dim omsg = "Bitte selektieren Sie einige 1 oder mehr Dokumente" - If USER_LANGUAGE <> "de-DE" Then - - omsg = "Please select some documents!" - End If + Dim omsg = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("MASS_NO_WF_SELECTED") FormHelper.ShowInfoMessage(omsg, omsgTitleWarning) Exit Sub End If @@ -2996,11 +2944,8 @@ Public Class frmMain LoadNavBar() Await Decide_Load(False) Else - If USER_LANGUAGE = "de-DE" Then - MsgBox("Massenabschluss konnte nicht ausgeführt werden, weil windream nicht initialisiert werden konnte!", MsgBoxStyle.Critical, "Massenabschluss") - Else - MsgBox("Massvalidation could not be completed because of an error in windream", MsgBoxStyle.Critical, "Massvalidation") - End If + Dim oMSG = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("MASS_ERROR_WINDREAM") + MsgBox(oMSG, MsgBoxStyle.Critical, "Unexpected Error Massvalidation") End If Catch ex As Exception LOGGER.Error(ex) diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index d4f5910..d79d97f 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -123,7 +123,7 @@ - 0, 151 + 0, 158 Fill @@ -131,6 +131,31 @@ 0, 0 + + Top, Left, Right + + + Segoe UI Symbol, 12pt, style=Bold + + + 3, 4 + + + No + + + 433, 29 + + + + 1 + + + Label1 + + + MiddleLeft + TITLELabel1 @@ -143,6 +168,30 @@ 0 + + Bottom, Left, Right + + + Tahoma, 9.75pt + + + MiddleLeft + + + 7, 446 + + + 3, 4, 3, 4 + + + 445, 50 + + + 11 + + + Validierung speichern - Nächstes Dokument + btnSave @@ -155,6 +204,21 @@ 1 + + Top, Left, Right + + + 5, 33 + + + 447, 48 + + + 1 + + + Label3 + DESCRIPTIONLabel @@ -167,6 +231,24 @@ 2 + + Top, Bottom, Left, Right + + + True + + + 8, 85 + + + 3, 4, 3, 4 + + + 444, 353 + + + 18 + PanelValidatorControl @@ -189,9 +271,8 @@ 3, 4, 3, 4 - 455, 511 + 455, 503 - 24 @@ -229,7 +310,7 @@ 3, 4, 3, 4 - 460, 511 + 460, 503 0 @@ -259,7 +340,7 @@ 1 - 919, 511 + 919, 503 455 @@ -310,7 +391,7 @@ 3, 4, 3, 4 - 254, 511 + 256, 503 0 @@ -343,7 +424,7 @@ 1 - 1185, 511 + 1185, 503 44 @@ -360,135 +441,6 @@ 0 - - Top, Left, Right - - - Segoe UI Symbol, 12pt, style=Bold - - - 3, 4 - - - No - - - 433, 29 - - - 1 - - - Label1 - - - MiddleLeft - - - TITLELabel1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 0 - - - Bottom, Left, Right - - - Tahoma, 9.75pt - - - MiddleLeft - - - 7, 454 - - - 3, 4, 3, 4 - - - 445, 50 - - - 11 - - - Validierung speichern - Nächstes Dokument - - - btnSave - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 1 - - - Top, Left, Right - - - 5, 33 - - - 447, 48 - - - 1 - - - Label3 - - - DESCRIPTIONLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 2 - - - Top, Bottom, Left, Right - - - True - - - 8, 85 - - - 3, 4, 3, 4 - - - 444, 361 - - - 18 - - - PanelValidatorControl - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 3 - 17, 17 @@ -1077,20 +1029,54 @@ 0, 0 + + Aktionen + + + Beendete Konversationen + + + Funktionen + Konversationen + + Datei + + + Aktionen + + + Anhänge zu Beleg + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEluZm87bRIthgAAAVxJREFUWEfF + l7FxwzAMRT2Bq4yjPp1nyAAZxNu4dZkt0rnLCm4ZPF+gg5LPCLJko3h3Ovn/T5gCSWnXWitF3nwm48Uw + DHPsjYNxNM7Gxbj+wDX3+A0NWpUxsqSAF+Pd+DBaErR48KrMdAGvxslQg2TAS8af7EwBb8anoYKXQAZZ + k/y5AjB8GSrwHsiaFPFfAUzZFv/8N2SOj6NXAE2z5pnPQfatMXsF0LnKuCWMIQtg7aaXmvuCX+oEjLF3 + XwxgA1EGifuCX+o6HNwXA9jFlFjivuCXug5H98UAtlIllrgv+KWuw9l9MYD9XIkl7gt+qetwcV8M4FBR + Yon7gl/qOlzdFwPKCyh/BOVNWL4MF21EK5EbUflWDOnDyH3BL3WC7mEE5ccxlL6QOKWvZA6GLWaCjMng + kCkAmLI1PYF3nPZItgCgaejc9BI10OK5NZxiSQHOYz/NqpA3n0fbfQM/tJcKTygMggAAAABJRU5ErkJg + gg== + + + + Information + Start - 1185, 151 + 1185, 158 - 0, 662 + 0, 661 - 1185, 21 + 1185, 22 RibbonStatusBar1 @@ -2007,39 +1993,6 @@ Zoom - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYyMS4yLCBWZXJzaW9uPTIxLjIu - NC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFlE - ZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVi - bGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29s - VGlwBwAAAA1BbGxvd0h0bWxUZXh0EUZpeGVkVG9vbFRpcFdpZHRoCkl0ZW1zQ291bnQJaXRlbVR5cGUw - BWl0ZW0wCWl0ZW1UeXBlMQVpdGVtMQQAAAQEBAQfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVh - bgMAAAABCCVEZXZFeHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAgAAACFEZXZFeHByZXNz - LlV0aWxzLlRvb2xUaXBUaXRsZUl0ZW0CAAAAJURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29sVGlwSXRl - bVR5cGUCAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0CAAAAAgAAAAX8////H0RldkV4cHJl - c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4BAAAAB3ZhbHVlX18ACAMAAAACAAAAAAIAAAAF+////yVEZXZF - eHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAQAAAAd2YWx1ZV9fAAgCAAAAAQAAAAkGAAAA - Afn////7////AAAAAAkIAAAADAkAAABRU3lzdGVtLkRyYXdpbmcsIFZlcnNpb249NC4wLjAuMCwgQ3Vs - dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQYAAAAhRGV2RXhwcmVz - cy5VdGlscy5Ub29sVGlwVGl0bGVJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25z - CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl - c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl - c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA - AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN - QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs - b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT - eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp - b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg - Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ - dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k - ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl - c3MuVXRpbHMuVG9vbFRpcEltYWdlQWxpZ25tZW50AgAAAAgIAgAAAAYQAAAAAAXv////E1N5c3RlbS5E - cmF3aW5nLlNpemUCAAAABXdpZHRoBmhlaWdodAAACAgJAAAAAAAAAAAAAAAF7v///yZEZXZFeHByZXNz - LlV0aWxzLlRvb2xUaXBJbWFnZUFsaWdubWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAD/////DgAAAAEO - AAAACwAAAAkQAAAAAe3////v////AAAAAAAAAAAB7P///+7///8AAAAA/////w4AAAAL - - 10% @@ -2082,6 +2035,39 @@ sichtbare einpassen + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYyMS4yLCBWZXJzaW9uPTIxLjIu + NC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFlE + ZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVi + bGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29s + VGlwBwAAAA1BbGxvd0h0bWxUZXh0EUZpeGVkVG9vbFRpcFdpZHRoCkl0ZW1zQ291bnQJaXRlbVR5cGUw + BWl0ZW0wCWl0ZW1UeXBlMQVpdGVtMQQAAAQEBAQfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVh + bgMAAAABCCVEZXZFeHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAgAAACFEZXZFeHByZXNz + LlV0aWxzLlRvb2xUaXBUaXRsZUl0ZW0CAAAAJURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29sVGlwSXRl + bVR5cGUCAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0CAAAAAgAAAAX8////H0RldkV4cHJl + c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4BAAAAB3ZhbHVlX18ACAMAAAACAAAAAAIAAAAF+////yVEZXZF + eHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAQAAAAd2YWx1ZV9fAAgCAAAAAQAAAAkGAAAA + Afn////7////AAAAAAkIAAAADAkAAABRU3lzdGVtLkRyYXdpbmcsIFZlcnNpb249NC4wLjAuMCwgQ3Vs + dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQYAAAAhRGV2RXhwcmVz + cy5VdGlscy5Ub29sVGlwVGl0bGVJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25z + CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl + c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl + c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA + AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN + QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs + b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT + eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp + b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg + Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ + dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k + ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl + c3MuVXRpbHMuVG9vbFRpcEltYWdlQWxpZ25tZW50AgAAAAgIAgAAAAYQAAAAAAXv////E1N5c3RlbS5E + cmF3aW5nLlNpemUCAAAABXdpZHRoBmhlaWdodAAACAgJAAAAAAAAAAAAAAAF7v///yZEZXZFeHByZXNz + LlV0aWxzLlRvb2xUaXBJbWFnZUFsaWdubWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAD/////DgAAAAEO + AAAACwAAAAkQAAAAAe3////v////AAAAAAAAAAAB7P///+7///8AAAAA/////w4AAAAL + + BarButtonItem1 @@ -2094,40 +2080,6 @@ 1029, 17 - - Funktionen - - - Aktionen - - - Beendete Konversationen - - - Datei - - - Aktionen - - - Anhänge zu Beleg - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEluZm87bRIthgAAAVxJREFUWEfF - l7FxwzAMRT2Bq4yjPp1nyAAZxNu4dZkt0rnLCm4ZPF+gg5LPCLJko3h3Ovn/T5gCSWnXWitF3nwm48Uw - DHPsjYNxNM7Gxbj+wDX3+A0NWpUxsqSAF+Pd+DBaErR48KrMdAGvxslQg2TAS8af7EwBb8anoYKXQAZZ - k/y5AjB8GSrwHsiaFPFfAUzZFv/8N2SOj6NXAE2z5pnPQfatMXsF0LnKuCWMIQtg7aaXmvuCX+oEjLF3 - XwxgA1EGifuCX+o6HNwXA9jFlFjivuCXug5H98UAtlIllrgv+KWuw9l9MYD9XIkl7gt+qetwcV8M4FBR - Yon7gl/qOlzdFwPKCyh/BOVNWL4MF21EK5EbUflWDOnDyH3BL3WC7mEE5ccxlL6QOKWvZA6GLWaCjMng - kCkAmLI1PYF3nPZItgCgaejc9BI10OK5NZxiSQHOYz/NqpA3n0fbfQM/tJcKTygMggAAAABJRU5ErkJg - gg== - - - - Information - RibbonPage2 diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 12a3085..67f7a30 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -2558,10 +2558,8 @@ Public Class frmValidator ' ############ Infos eintragen ################# ' txtDateipfad.Text = Document_Path - Dim omsg = $"Verbleibende Belege: {Amount_Docs2Validate}" - If USER_LANGUAGE <> "de-DE" Then - omsg = $"Remaining documents: {omsg}" - End If + Dim omsg = $"{ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("remainingOps")}: {Amount_Docs2Validate}" + If Amount_Docs2Validate > 0 Then bsiInformation.Caption = omsg Else @@ -2631,10 +2629,8 @@ Public Class frmValidator errormessage = oErrMsgMissingInput frmError.ShowDialog() Else - Dim oMsg = "Ende des Profils - Keine weiteren Vorgänge!" - If USER_LANGUAGE <> "de-DE" Then - oMsg = "End of profile - no more objects!" - End If + Dim oMsg = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("msgEndOfProfile") + LOGGER.Info(oMsg) Dim oROW As DataRow = ClassAllgemeineFunktionen.GUI_LANGUAGE_MSGBOX("frmValidator.NoMoreDocument") 'Try @@ -2979,6 +2975,7 @@ Public Class frmValidator If IDB_ACTIVE = False Then oValuefromSource = CURRENT_WMFILE.GetVariableValue(oSourceIndexName) Else + LOGGER.Debug($"GetVariableValuefromSource - IDBCase...") oValuefromSource = IDBData.GetVariableValue(oSourceIndexName, oIDBTyp, FromIDB) End If Return oValuefromSource @@ -3200,7 +3197,7 @@ Public Class frmValidator LOGGER.Debug("Indexwert soll nicht geladen werden.") Exit Select End If - LOGGER.Debug($"getting wmValue for Index {oSourceIndexName}...") + LOGGER.Debug($"getting Value for Attribute [{oSourceIndexName}] - oIDBTyp [{oIDBTyp}] - oIDBOverride [{oIDBOverride}]...") ' Dim wertWD = CURRENT_WMFILE.GetVariableValue(oSourceIndexName) oValueFromSource = GetVariableValuefromSource(oSourceIndexName, oIDBTyp, oIDBOverride) @@ -3248,6 +3245,8 @@ Public Class frmValidator Else If oValueType = "System.String" Then LOGGER.Debug($"IDB Fill Grid [{oControl.Name}] with String") + LOGGER.Debug($"oValueFromSource [{oValueFromSource}] - PMDelimiter[{PMDelimiter}]") + oColValuesfromSource = Split(oValueFromSource.ToString, PMDelimiter) If oColValuesfromSource.Length > 8 Then LOGGER.Warn("Fill Grid Error - Max 8 columns can be configured!") @@ -5715,10 +5714,7 @@ Public Class frmValidator My.Settings.Save() End Sub Private Sub btnSave_MouseHover(sender As Object, e As EventArgs) Handles btnSave.MouseHover - Dim oMsg = "F2 für Speichern" - If USER_LANGUAGE <> "de-DE" Then - oMsg = "F2 for saving" - End If + Dim oMsg = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("F2forSave") ToolTip1.Show(oMsg, btnSave) End Sub @@ -5827,12 +5823,8 @@ Public Class frmValidator Private Sub BbtnItm_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BbtnitmSave.ItemClick If ForceGridValidation() = True Then Dim oRESULT As String + oRESULT = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("InputSaved") - If USER_LANGUAGE = "de-DE" Then - oRESULT = "Eingaben gespeichert" - Else - oRESULT = "Eingaben gespeichert" - End If If Check_UpdateIndexe() = True Then SetStatusLabel($"Data saved", "LimeGreen") LOGGER.Info("Workflowdata saved manually!")