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

Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ProcessManager_Client

Browse Source
This commit is contained in:
SchreiberM 2021-01-12 17:27:05 +01:00
commit 917bacfba4
2 changed files with 55 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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("2.1.6.2")> <Assembly: AssemblyVersion("2.1.6.3")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>

98
app/DD_PM_WINDREAM/frmValidator.vb
View File

@ -3247,10 +3247,10 @@ Public Class frmValidator
oValueFromSource = GetVariableValuefromSource(oSourceIndexName, oIDBTyp, oIDBOverride) oValueFromSource = GetVariableValuefromSource(oSourceIndexName, oIDBTyp, oIDBOverride)
If oValueFromSource Is Nothing = False Then If oValueFromSource Is Nothing = False Then
Dim omytype = oValueFromSource.GetType.ToString Dim oValueType = oValueFromSource.GetType.ToString
LOGGER.Debug($"omytype is [{omytype}]!") LOGGER.Debug($"oValueType is [{oValueType}]!")
'Es wird gegen ein Vektorfeld nachindexiert 'Es wird gegen ein Vektorfeld nachindexiert
If omytype.Contains("System.Object") Or omytype = "System.Data.DataTable" Or omytype = "System.String" Then If oValueType.Contains("System.Object") Or oValueType = "System.Data.DataTable" Or oValueType = "System.String" Then
Select Case oTyp Select Case oTyp
'Tabellendarstellung 'Tabellendarstellung
Case "TABLE" Case "TABLE"
@ -3269,49 +3269,59 @@ Public Class frmValidator
LOGGER.Debug($"vektorrow Value {Zeile.ToString}...") LOGGER.Debug($"vektorrow Value {Zeile.ToString}...")
oColValuesfromSource = Split(Zeile, PMDelimiter) oColValuesfromSource = Split(Zeile, PMDelimiter)
Select Case oDTColumnsPerDevExGrid.Rows.Count Dim oNewRow = oDataSource.NewRow()
Case 1 For index = 0 To oDTColumnsPerDevExGrid.Rows.Count - 1
oDataSource.Rows.Add(New String() {Zeile.ToString}) If oColValuesfromSource.Length > index Then
oNewRow.Item(index) = oColValuesfromSource(index)
Else
oNewRow.Item(index) = String.Empty
End If
Next
oDataSource.Rows.Add(oNewRow)
'dgv.Rows.Add(New String() {Zeile.ToString}) 'Select Case oDTColumnsPerDevExGrid.Rows.Count
Case 2 ' Case 1
If oColValuesfromSource.Length = 2 Then ' oDataSource.Rows.Add(New String() {Zeile.ToString})
oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1)})
'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1)})
Else
oDataSource.Rows.Add(New String() {oColValuesfromSource(0), ""})
'dgv.Rows.Add(New String() {SpaltenWerte(0), ""})
End If
Case 3
If oColValuesfromSource.Length = 3 Then
oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)})
'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2)})
ElseIf oColValuesfromSource.Length = 2 Then
oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), ""})
'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), ""})
Else
oDataSource.Rows.Add(New String() {oColValuesfromSource(0), "", ""})
'dgv.Rows.Add(New String() {SpaltenWerte(0), "", ""})
End If
Case 4
If oColValuesfromSource.Length = 4 Then
oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)})
'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), SpaltenWerte(3)})
ElseIf oColValuesfromSource.Length = 3 Then
oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), ""})
'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), ""})
ElseIf oColValuesfromSource.Length = 2 Then
oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), "", ""})
'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), "", ""})
Else
oDataSource.Rows.Add(New String() {oColValuesfromSource(0), "", "", ""})
'dgv.Rows.Add(New String() {SpaltenWerte(0), "", "", ""})
End If
End Select ' 'dgv.Rows.Add(New String() {Zeile.ToString})
' Case 2
' If oColValuesfromSource.Length = 2 Then
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1)})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1)})
' Else
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), ""})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), ""})
' End If
' Case 3
' If oColValuesfromSource.Length = 3 Then
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2)})
' ElseIf oColValuesfromSource.Length = 2 Then
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), ""})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), ""})
' Else
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), "", ""})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), "", ""})
' End If
' Case 4
' If oColValuesfromSource.Length = 4 Then
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), SpaltenWerte(3)})
' ElseIf oColValuesfromSource.Length = 3 Then
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), ""})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), ""})
' ElseIf oColValuesfromSource.Length = 2 Then
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), "", ""})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), "", ""})
' Else
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), "", "", ""})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), "", "", ""})
' End If
'End Select
Next Next
Else Else
If omytype = "System.String" Then If oValueType = "System.String" Then
LOGGER.Debug($"IDB Fill Grid [{oControl.Name}] with String") LOGGER.Debug($"IDB Fill Grid [{oControl.Name}] with String")
oColValuesfromSource = Split(oValueFromSource.ToString, PMDelimiter) oColValuesfromSource = Split(oValueFromSource.ToString, PMDelimiter)
If oColValuesfromSource.Length > 8 Then If oColValuesfromSource.Length > 8 Then
@ -3336,7 +3346,7 @@ Public Class frmValidator
oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6), oColValuesfromSource(7)}) oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6), oColValuesfromSource(7)})
End Select End Select
ElseIf omytype = "System.Data.DataTable" Then ElseIf oValueType = "System.Data.DataTable" Then
Dim oMyDatatable As DataTable = oValueFromSource Dim oMyDatatable As DataTable = oValueFromSource
LOGGER.Debug($"IDB Fill Grid [{oControl.Name}] with Datatable - Rows: " & oMyDatatable.Rows.Count) LOGGER.Debug($"IDB Fill Grid [{oControl.Name}] with Datatable - Rows: " & oMyDatatable.Rows.Count)
For Each oRow As DataRow In oMyDatatable.Rows For Each oRow As DataRow In oMyDatatable.Rows
@ -3387,7 +3397,7 @@ Public Class frmValidator
Next Next
End Select End Select
Else Else
LOGGER.Warn($"Could not load Devexpress.Grid [{oControl.Name }] as omytype is [{omytype}]!") LOGGER.Warn($"Could not load Devexpress.Grid [{oControl.Name }] as omytype is [{oValueType}]!")
End If End If