This commit is contained in:
2020-03-05 10:27:23 +01:00
parent f636abc2fc
commit 61a3e9b6d3
34 changed files with 6056 additions and 2576 deletions

View File

@@ -5,9 +5,9 @@ Imports WINDREAMLib
Public Class ClassAllgemeineFunktionen
Public Shared Function GUI_LANGUAGE_INFO(pTITLE As String)
Dim oFilteredDatatable As DataTable = CURRENT_DT_GUI_LANGUAGE_PHRASES.Clone()
Dim oFilteredDatatable As DataTable = BASEDATA_DT_GUI_LANGUAGE_PHRASES.Clone()
Dim oExpression = $"LANGUAGE ='{USER_LANGUAGE}' AND TITLE = '{pTITLE}'"
CURRENT_DT_GUI_LANGUAGE_PHRASES.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges)
BASEDATA_DT_GUI_LANGUAGE_PHRASES.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges)
If oFilteredDatatable.Rows.Count = 1 Then
If oFilteredDatatable.Rows(0).Item("CAPT_TYPE") = "MsgBox" Then
Return oFilteredDatatable
@@ -25,9 +25,9 @@ Public Class ClassAllgemeineFunktionen
End If
End Function
Public Shared Function GUI_LANGUAGE_MSGBOX(pTITLE As String)
Dim oFilteredDatatable As DataTable = CURRENT_DT_GUI_LANGUAGE_PHRASES.Clone()
Dim oFilteredDatatable As DataTable = BASEDATA_DT_GUI_LANGUAGE_PHRASES.Clone()
Dim oExpression = $"LANGUAGE = '{USER_LANGUAGE}' AND TITLE = '{pTITLE}'"
CURRENT_DT_GUI_LANGUAGE_PHRASES.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges)
BASEDATA_DT_GUI_LANGUAGE_PHRASES.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges)
If oFilteredDatatable.Rows.Count = 1 Then
Return oFilteredDatatable.Rows(0)
Else
@@ -64,7 +64,7 @@ Public Class ClassAllgemeineFunktionen
ERR_MSG = ERR_MSG.Replace("'", "''")
Dim insert As String = $"INSERT INTO TBPM_LOG_DEBUG (USERID, LOGMSG) VALUES ({USER_ID},'{ERR_MSG}')"
If ExecuteonMSSQL(insert, CONNECTION_STRING) <> "" Then
LOGGER.Info("Eintrag in Log-Tabelle konnte nicht erstellt werden!!", True)
LOGGER.Warn("...Eintrag in Log-Tabelle konnte nicht erstellt werden!!", True)
End If
Catch ex As Exception
LOGGER.Error(ex)