From ebc6d21caff6a6e3a935cd506919a35ac1c88802 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Fri, 31 Mar 2023 12:42:23 +0200 Subject: [PATCH 1/2] MS Config Layout Sprache --- app/TaskFlow/frmMain.vb | 3 +-- app/TaskFlow/frmValidatorSearch.vb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb index b66efe8..c154560 100644 --- a/app/TaskFlow/frmMain.vb +++ b/app/TaskFlow/frmMain.vb @@ -605,7 +605,7 @@ Public Class frmMain End Function Private Function GetXML_LayoutName() - Dim Filename As String = String.Format("DevExpressGridViewOverview_UserLayout_{0}.xml", GRID_LOAD_TYPE) + Dim Filename As String = String.Format("DevExpressGridViewOverview_UserLayout_{0}_{1}.xml", GRID_LOAD_TYPE, USER_LANGUAGE) Return System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename) End Function @@ -1210,7 +1210,6 @@ Public Class frmMain End If Catch ex As Exception - LOGGER.Error(ex) LOGGER.Info("Unexpected Error in Column_inGridViewLayout: " & ex.Message) Return Not False End Try diff --git a/app/TaskFlow/frmValidatorSearch.vb b/app/TaskFlow/frmValidatorSearch.vb index 895cb5b..b378529 100644 --- a/app/TaskFlow/frmValidatorSearch.vb +++ b/app/TaskFlow/frmValidatorSearch.vb @@ -657,7 +657,7 @@ Public Class frmValidatorSearch End Sub Private Function Get_DocGrid_Layout_Filename(oIndex As Integer) Dim oUserConfigPath = CONFIG.UserConfigPath.Replace("UserConfig.xml", "") - Dim oFilename As String = String.Format("GridViewDoc_Search-{0}-{1}-UserLayout.xml", oIndex, CURRENT_ProfilGUID) + Dim oFilename As String = String.Format("GridViewDoc_Search-{0}-{1}-{2}-UserLayout.xml", oIndex, CURRENT_ProfilGUID, USER_LANGUAGE) Dim oPath = System.IO.Path.Combine(oUserConfigPath, oFilename) Return oPath End Function From 1c059fbbe8e94efa6ae7d901f5d224786d9a6830 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Thu, 13 Apr 2023 11:39:17 +0200 Subject: [PATCH 2/2] MS 2.4.2.1 OverrideLang entfernt --- app/TaskFlow/ClassIDBData.vb | 5 +++-- app/TaskFlow/My Project/AssemblyInfo.vb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/TaskFlow/ClassIDBData.vb b/app/TaskFlow/ClassIDBData.vb index fa7adf2..9bcc9a4 100644 --- a/app/TaskFlow/ClassIDBData.vb +++ b/app/TaskFlow/ClassIDBData.vb @@ -232,8 +232,9 @@ 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 = DatabaseFallback.ExecuteNonQueryIDB(oFNSQL) + + Dim oPRSQL = $"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 = DatabaseFallback.ExecuteNonQueryIDB(oPRSQL) If oSuccess = False Then Return False End If diff --git a/app/TaskFlow/My Project/AssemblyInfo.vb b/app/TaskFlow/My Project/AssemblyInfo.vb index cf86939..465c029 100644 --- a/app/TaskFlow/My Project/AssemblyInfo.vb +++ b/app/TaskFlow/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - +