AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
PitzM 2023-04-24 15:25:41 +02:00
commit f37b4188c2
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/TaskFlow/ClassIDBData.vb
View File

@ -232,8 +232,9 @@
For Each oNewValueRow As DataRow In oDTMyNewValues.Rows For Each oNewValueRow As DataRow In oDTMyNewValues.Rows
Dim oSuccess As Boolean = False 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 If oSuccess = False Then
Return False Return False
End If End If

6
app/TaskFlow/My Project/AssemblyInfo.vb
View File

@ -9,7 +9,7 @@ Imports System.Runtime.InteropServices
' Die Werte der Assemblyattribute überprüfen ' Die Werte der Assemblyattribute überprüfen
<Assembly: AssemblyTitle("TaskFlow")> <Assembly: AssemblyTitle("TaskFlow")>
<Assembly: AssemblyDescription("")> <Assembly: AssemblyDescription("")>
<Assembly: AssemblyCompany("Digital Data")> <Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("TaskFlow")> <Assembly: AssemblyProduct("TaskFlow")>
<Assembly: AssemblyCopyright("Copyright © Digital Data 2023")> <Assembly: AssemblyCopyright("Copyright © Digital Data 2023")>
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.4.3.0")> <Assembly: AssemblyVersion("2.4.2.1")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>

3
app/TaskFlow/frmMain.vb
View File

@ -605,7 +605,7 @@ Public Class frmMain
End Function End Function
Private Function GetXML_LayoutName() 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) Return System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
End Function End Function
@ -1210,7 +1210,6 @@ Public Class frmMain
End If End If
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex)
LOGGER.Info("Unexpected Error in Column_inGridViewLayout: " & ex.Message) LOGGER.Info("Unexpected Error in Column_inGridViewLayout: " & ex.Message)
Return Not False Return Not False
End Try End Try

2
app/TaskFlow/frmValidatorSearch.vb
View File

@ -657,7 +657,7 @@ Public Class frmValidatorSearch
End Sub End Sub
Private Function Get_DocGrid_Layout_Filename(oIndex As Integer) Private Function Get_DocGrid_Layout_Filename(oIndex As Integer)
Dim oUserConfigPath = CONFIG.UserConfigPath.Replace("UserConfig.xml", "") 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) Dim oPath = System.IO.Path.Combine(oUserConfigPath, oFilename)
Return oPath Return oPath
End Function End Function