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

Merge branch 'master' of http://172.24.11.74:90/scm/git/ProcessManagerClient

Browse Source
This commit is contained in:
Jonathan Jenne 2019-06-07 15:35:45 +02:00
commit 2ea9d41a78
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/DD_PM_WINDREAM/ClassInit.vb
View File

@ -179,7 +179,7 @@ Public Class ClassInit
USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS") USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")
USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN") USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN")
USER_RIGHT_FILE_DELETE = DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL") USER_RIGHT_FILE_DELETE = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")), False, DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL"))
USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT") USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT")
USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN")

2
app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb
View File

@ -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("1.9.6.0")> <Assembly: AssemblyVersion("1.9.6.1")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>

7
app/DD_PM_WINDREAM/frmMassValidator.vb
View File

@ -1409,7 +1409,7 @@ Public Class frmMassValidator
If oMyControlInput = "Unexp. error in GetWM_Value_Multiple_Docs" Then If oMyControlInput = "Unexp. error in GetWM_Value_Multiple_Docs" Then
Continue For Continue For
End If End If
If oMyControlInput = "(Untersch. Werte)" Then If oMyControlInput = "(Untersch. Werte)" Or oMyControlInput = "(Different values)" Then
Continue For Continue For
End If End If
If oIndexname.StartsWith("[%VKT") Then If oIndexname.StartsWith("[%VKT") Then
@ -1421,7 +1421,7 @@ Public Class frmMassValidator
Exit For Exit For
End If End If
Else Else
If oMyControlInput = "(Untersch. Werte)" Then If oMyControlInput = "(Untersch. Werte)" Or oMyControlInput = "(Different values)" Then
Continue For Continue For
End If End If
Dim result() As String Dim result() As String
@ -1455,6 +1455,9 @@ Public Class frmMassValidator
Exit For Exit For
Else Else
oMyControlInput = oControl.Text oMyControlInput = oControl.Text
If oMyControlInput = "(Untersch. Werte)" Or oMyControlInput = "(Different values)" Then
Continue For
End If
'Wenn der Wert in ein Vektorfeld geschrieben wird 'Wenn der Wert in ein Vektorfeld geschrieben wird
If oIndexname.StartsWith("[%VKT") Then If oIndexname.StartsWith("[%VKT") Then
oMyControlInput = Return_PM_VEKTOR(oMyControlInput, oIndexname) oMyControlInput = Return_PM_VEKTOR(oMyControlInput, oIndexname)

2
app/DD_PM_WINDREAM/frmValidator.vb
View File

@ -508,7 +508,7 @@ Public Class frmValidator
sql = clsPatterns.ReplaceInternalValues(sql) sql = clsPatterns.ReplaceInternalValues(sql)
LOGGER.Debug(">>> sql after ReplaceInternalValues: " & sql) LOGGER.Debug(">>> sql after ReplaceInternalValues: " & sql)
'sql = ClassPatterns.ReplaceInternalValues(sqlStatement) 'sql = ClassPatterns.ReplaceInternalValues(sqlStatement)
dt = ClassDatabase.Return_Datatable(sql) dt = ClassDatabase.Return_Datatable_CS(sql, connectionId)
If IsNothing(dt) Then If IsNothing(dt) Then
MsgBox($"SQL-Query for control {control.Name} is invalid.") MsgBox($"SQL-Query for control {control.Name} is invalid.")