diff --git a/app/SetupVS19/Product.wxs b/app/SetupVS19/Product.wxs
index 7352f81..d8eb9d5 100644
--- a/app/SetupVS19/Product.wxs
+++ b/app/SetupVS19/Product.wxs
@@ -167,6 +167,8 @@
+
+
diff --git a/app/TaskFlow/ClassPMWindream.vb b/app/TaskFlow/ClassPMWindream.vb
index 31d5ce7..f5f8e5d 100644
--- a/app/TaskFlow/ClassPMWindream.vb
+++ b/app/TaskFlow/ClassPMWindream.vb
@@ -152,14 +152,20 @@ Public Class ClassPMWindream
'Den Typ des Index-Feldes auslesen
'MsgBox(value.GetType.ToString)
Select Case vType
- 'Case WMObjectVariableValueTypeUndefined
Case WMObjectVariableValueTypeString
LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeString")
- convertValue = CStr(value)
+ If value = "DeleteWMAttributeValue" Then
+ LOGGER.Debug("Indexing simpleAttribute with String.Empty")
+ convertValue = CStr(String.Empty)
+ Else
+ convertValue = CStr(value)
+ End If
+
Case WMObjectVariableValueTypeInteger
LOGGER.Debug("Typ des windream-Indexes: WMObjectVariableValueTypeInteger")
If IsNumeric(value) = False Then
If value = String.Empty Then
+ LOGGER.Debug("Indexing WMObjectVariableValueTypeInteger with vbEmpty")
convertValue = vbEmpty
Else
frmValidator.idxerr_message = "Unerlaubte Eingabe in Numerisches Feld: " & value
@@ -289,17 +295,8 @@ Public Class ClassPMWindream
LOGGER.Info(" >> Unexpected Error in Logging SetVariableValue for " & aName & ": " & ex.Message, False)
End Try
- 'Dim ArrValues()
- 'ReDim ArrValues(0)
- 'ArrValues(0) = convertValue
- 'Dim ArrName()
- 'ReDim ArrName(0)
- 'ArrName(0) = "Tournr"
- 'oDocument.SetValues(ArrName, ArrValues)
- 'If convertValue = String.Empty Or convertValue = vbEmpty Then
- ' LOGGER.Debug("Now Indexing simpleAttribute with vbEmpty ...")
- ' oDocument.SetVariableValue(aName, String.Empty)
- 'Else
+
+
If _int = True Then
oDocument.SetVariableValue(aName, CInt(convertValue))
ElseIf _date = True Then
@@ -318,128 +315,135 @@ Public Class ClassPMWindream
Else
'VEKTORFELDER, ALSO ÜBERPRÜFEN OB ERGEBNIS-ARRAY GEFÜLLT IST
LOGGER.Debug("VEKTORFELD: Vorbereiten des Arrays", False)
- Dim myArray()
- 'Dim anz As Integer = 0
- 'For Each obj In aValues
- 'ReDim Preserve myArray(anz)
- Select Case vType
- Case 4100
- 'Vektortyp Boolean
- 'Umwandeln in Boolean
- 'Die Größe des Arrays festlegen
- ReDim myArray(aValues.Length - 1)
- Dim i1 As Integer = 0
- 'Das Array durchlaufen und Werte für den Index in Array schreiben
- For Each obj In aValues
- Select Case obj.ToString.ToLower
- Case "falsch"
- obj = False
- Case "wahr"
- obj = True
- Case "nein"
- obj = False
- Case "ja"
- obj = True
- Case "0"
- obj = False
- Case "1"
- obj = True
- End Select
- myArray(i1) = CBool(obj)
- i1 = i1 + 1
- Next
- Case 4101
- 'Vektortyp Date
- 'Umwandeln in String
- 'Die Größe des Arrays festlegen
- ReDim myArray(aValues.Length - 1)
- Dim i1 As Integer = 0
- 'Das Array durchlaufen und Werte für den Index in Array schreiben
- For Each obj In aValues
- myArray(i1) = CDate(obj)
- i1 = i1 + 1
- Next
- Case 4104
- 'Vektortyp Currency
- 'Die Größe des Arrays festlegen
- ReDim myArray(aValues.Length - 1)
- Dim i1 As Integer = 0
- 'Das Array durchlaufen und Werte für den Index in Array schreiben
- For Each obj In aValues
- Dim aValueWrapper As System.Runtime.InteropServices.CurrencyWrapper = New System.Runtime.InteropServices.CurrencyWrapper(CDec(obj))
- myArray(i1) = aValueWrapper
- i1 = i1 + 1
- Next
- Case 4097
- 'Vektortyp ALPHANUMERISCH
- 'Umwandeln in String
- 'Die Größe des Arrays festlegen
- ReDim myArray(aValues.Length - 1)
- Dim i1 As Integer = 0
- 'Das Array durchlaufen und Werte für den Index in Array schreiben
- For Each obj In aValues
- myArray(i1) = CStr(obj)
- i1 = i1 + 1
- Next
-
- Case 4098
- 'Umwandeln in Integer
- 'Die Größe des Arrays festlegen
- ReDim myArray(aValues.Length - 1)
- Dim i1 As Integer = 0
- 'Das Array durchlaufen und Werte für den Index in Array schreiben
- For Each obj In aValues
- myArray(i1) = CInt(obj)
- i1 = i1 + 1
- Next
- Case 4099
- 'Umwandeln in Double
- 'Die Größe des Arrays festlegen
- ReDim myArray(aValues.Length - 1)
- Dim i1 As Integer = 0
- 'Das Array durchlaufen und Werte für den Index in Array schreiben
- For Each obj In aValues
- Dim Str As String = obj
- myArray(i1) = CDbl(Str.Replace(".", ","))
- i1 = i1 + 1
- Next
-
- Case 36865
- 'Umwandeln in String
- 'Die Größe des Arrays festlegen
- ReDim myArray(aValues.Length - 1)
- Dim i1 As Integer = 0
- 'Das Array durchlaufen und Werte für den Index in Array schreiben
- For Each obj In aValues
- myArray(i1) = CStr(obj)
- i1 = i1 + 1
- Next
- Case Else
- 'Umwandeln in String
- 'Die Größe des Arrays festlegen
- ReDim myArray(aValues.Length - 1)
- Dim i1 As Integer = 0
- 'Das Array durchlaufen und Werte für den Index in Array schreiben
- For Each obj In aValues
- myArray(i1) = CStr(obj)
- i1 = i1 + 1
- Next
- End Select
-
- LOGGER.Debug("Wert für Index vor Indexierung: [{0}]", myArray)
- 'Jetzt die Nachindexierung für Vektor-Felder
- If vType = 4097 Or vType = 36865 Then
- If myArray(0) = String.Empty Then
- 'Variante um Vektorfeld zu leeren
- LOGGER.Debug("Now Indexing vektor-attribute with vbEmpty ...")
- oDocument.SetVariableValue(aName, vbEmpty)
- Else
- oDocument.SetVariableValue(aName, myArray)
- End If
- Else
+ If aValues(0).ToString.Contains("DeleteWMAttributeValue") Then
+ 'Variante um Vektorfeld zu leeren
+ Dim myArray()
+ ReDim myArray(aValues.Length - 1)
+ myArray(0) = String.Empty
+ LOGGER.Debug("Now Indexing vektor-attribute with String.Empty ...")
oDocument.SetVariableValue(aName, myArray)
+ Else
+ Dim myArray()
+ Select Case vType
+ Case 4100
+ 'Vektortyp Boolean
+ 'Umwandeln in Boolean
+ 'Die Größe des Arrays festlegen
+ ReDim myArray(aValues.Length - 1)
+ Dim i1 As Integer = 0
+ 'Das Array durchlaufen und Werte für den Index in Array schreiben
+ For Each obj In aValues
+ Select Case obj.ToString.ToLower
+ Case "falsch"
+ obj = False
+ Case "wahr"
+ obj = True
+ Case "nein"
+ obj = False
+ Case "ja"
+ obj = True
+ Case "0"
+ obj = False
+ Case "1"
+ obj = True
+ End Select
+ myArray(i1) = CBool(obj)
+ i1 = i1 + 1
+ Next
+ Case 4101
+ 'Vektortyp Date
+ 'Umwandeln in String
+ 'Die Größe des Arrays festlegen
+ ReDim myArray(aValues.Length - 1)
+ Dim i1 As Integer = 0
+ 'Das Array durchlaufen und Werte für den Index in Array schreiben
+ For Each obj In aValues
+ myArray(i1) = CDate(obj)
+ i1 = i1 + 1
+ Next
+ Case 4104
+ 'Vektortyp Currency
+ 'Die Größe des Arrays festlegen
+ ReDim myArray(aValues.Length - 1)
+ Dim i1 As Integer = 0
+ 'Das Array durchlaufen und Werte für den Index in Array schreiben
+ For Each obj In aValues
+ Dim aValueWrapper As System.Runtime.InteropServices.CurrencyWrapper = New System.Runtime.InteropServices.CurrencyWrapper(CDec(obj))
+ myArray(i1) = aValueWrapper
+ i1 = i1 + 1
+ Next
+ Case 4097
+ 'Vektortyp ALPHANUMERISCH
+ 'Umwandeln in String
+ 'Die Größe des Arrays festlegen
+ ReDim myArray(aValues.Length - 1)
+ Dim i1 As Integer = 0
+ 'Das Array durchlaufen und Werte für den Index in Array schreiben
+ For Each obj In aValues
+ myArray(i1) = CStr(obj)
+ i1 = i1 + 1
+ Next
+
+ Case 4098
+ 'Umwandeln in Integer
+ 'Die Größe des Arrays festlegen
+ ReDim myArray(aValues.Length - 1)
+ Dim i1 As Integer = 0
+ 'Das Array durchlaufen und Werte für den Index in Array schreiben
+ For Each obj In aValues
+ myArray(i1) = CInt(obj)
+ i1 = i1 + 1
+ Next
+ Case 4099
+ 'Umwandeln in Double
+ 'Die Größe des Arrays festlegen
+ ReDim myArray(aValues.Length - 1)
+ Dim i1 As Integer = 0
+ 'Das Array durchlaufen und Werte für den Index in Array schreiben
+ For Each obj In aValues
+ Dim Str As String = obj
+ myArray(i1) = CDbl(Str.Replace(".", ","))
+ i1 = i1 + 1
+ Next
+
+ Case 36865
+ 'Umwandeln in String
+ 'Die Größe des Arrays festlegen
+ ReDim myArray(aValues.Length - 1)
+ Dim i1 As Integer = 0
+ 'Das Array durchlaufen und Werte für den Index in Array schreiben
+ For Each obj In aValues
+ myArray(i1) = CStr(obj)
+ i1 = i1 + 1
+ Next
+ Case Else
+ 'Umwandeln in String
+ 'Die Größe des Arrays festlegen
+ ReDim myArray(aValues.Length - 1)
+ Dim i1 As Integer = 0
+ 'Das Array durchlaufen und Werte für den Index in Array schreiben
+ For Each obj In aValues
+ myArray(i1) = CStr(obj)
+ i1 = i1 + 1
+ Next
+ End Select
+ 'Jetzt die Nachindexierung für Vektor-Felder
+ LOGGER.Debug("Wert für Index vor Indexierung: [{0}]", myArray)
+
+ 'If vType = 4097 Or vType = 36865 Then
+ ' If myArray(0) = "DeleteWMAttributeValue" Then
+ ' 'Variante um Vektorfeld zu leeren
+ ' LOGGER.Debug("Now Indexing vektor-attribute with vbEmpty ...")
+ ' oDocument.SetVariableValue(aName, vbEmpty)
+ ' Else
+ ' oDocument.SetVariableValue(aName, myArray)
+ ' End If
+ 'Else
+ oDocument.SetVariableValue(aName, myArray)
+ 'End If
End If
+
LOGGER.Debug("'SetVariableValue' für VEKTOR erfolgreich", False)
End If
End If
diff --git a/app/TaskFlow/My Project/AssemblyInfo.vb b/app/TaskFlow/My Project/AssemblyInfo.vb
index 85df201..e597eec 100644
--- a/app/TaskFlow/My Project/AssemblyInfo.vb
+++ b/app/TaskFlow/My Project/AssemblyInfo.vb
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
'
-
+
diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb
index 534074b..cd5db57 100644
--- a/app/TaskFlow/frmValidator.vb
+++ b/app/TaskFlow/frmValidator.vb
@@ -247,12 +247,13 @@ Public Class frmValidator
Dim _step = 0
Try
- DocumentViewer1.Init(LOGCONFIG, GDPICTURE_LICENSE, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
+ Dim oDVSettings As New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
.ShowPrintButton = True,
.ShowRotateButton = True,
.ShowFlipButton = True,
.ShowSettingButton = True
- })
+ }
+ DocumentViewer1.Init(LOGCONFIG, GDPICTURE_LICENSE, oDVSettings)
Catch ex As Exception
MyValidationLogger.Error(ex)
End Try
@@ -2892,15 +2893,18 @@ Public Class frmValidator
Exit Sub
End Try
If ActiveWorkflowType = ConstAHWorkflow_BlindFile Or PROFILE_SHOW_DOCUMENT = False Then
+ If PROFILE_SHOW_DOCUMENT = False And ActiveWorkflowType <> ConstAHWorkflow_BlindFile Then
+ MyValidationLogger.Warn("PROFILE_SHOW_DOCUMENT = False - DocumentViewer won't be displayed. Configuration error?")
+ End If
SplitContainer1.Panel2Collapsed = True
If Not IsNothing(DocumentViewer1) Then
- DocumentViewer1.Visible = False
- End If
+ DocumentViewer1.Visible = False
+ End If
- RibbonPageFile.Visible = False
- Exit Sub
- Else
- If Not IsNothing(DocumentViewer1) Then
+ RibbonPageFile.Visible = False
+ Exit Sub
+ Else
+ If Not IsNothing(DocumentViewer1) Then
DocumentViewer1.Visible = True
End If
diff --git a/app/TaskFlow/frmValidatorSearch.resx b/app/TaskFlow/frmValidatorSearch.resx
index a48082b..f85acc3 100644
--- a/app/TaskFlow/frmValidatorSearch.resx
+++ b/app/TaskFlow/frmValidatorSearch.resx
@@ -855,7 +855,7 @@
iVBORw0KGgoAAAANSUhEUgAAACAAAAAZCAYAAABQDyyRAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
- JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsPAAALDwGS+QOlAAACbElE
+ JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsOAAALDgFAvuFBAAACbElE
QVRIS8WQb0gTcRyHJYig3hgkBBlRb8I3UvNdEHm9iOjUbU6mopUL2rIgx0SwUTTILUTJSJpJKbHWKlkm
EUhW4Mxw2h9tI0PT6bYWbbkyk+n+3Se8mun9or3Quw4e7u6B+32f+6YASPmfEEJoCCE0hBAaQggNIf5F
R5txrbW1cfRpu2FSX606+Oi2LnarSYebRh2aG7Ro1FdCpy5hjHVarcxKXZRZqW7uGVwIkYzONpNlbtJg
@@ -922,7 +922,7 @@
XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
- 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDwAACw8BkvkDpQAAAYdJREFUOE+NkG0rQ2Ec
+ 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDgAACw4BQL7hQQAAAYdJREFUOE+NkG0rQ2Ec
h/clfBS+gFdEXox3iqI85d0UjUKTp02O7axlM9vMkZ0sIxQSIdsLUUZ5bnmIzZrZ5uzBOT/d01bOjjN3
XXV397+uuv8KAAophgzO8gGKQfeoHcO0C2qtrVc8Qyh4yNGooqFs09WTe2ePtWSQYtClma1rUBnwr4CY
drWpurZDh5q2ycKA0bkOKei5NThXfeNkRtk+gZpWClUteumA1JmyraCssjkfkUI2MGFxY/PQn4toxXLR
diff --git a/app/TaskFlow/frmValidatorSearch.vb b/app/TaskFlow/frmValidatorSearch.vb
index a9716a5..2eb1841 100644
--- a/app/TaskFlow/frmValidatorSearch.vb
+++ b/app/TaskFlow/frmValidatorSearch.vb
@@ -687,6 +687,7 @@ Public Class frmValidatorSearch
End Sub
Private Sub ToolStripButtonRefreshSearches_Click(sender As Object, e As EventArgs) Handles ToolStripButtonRefreshSearches.Click
If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
+ LOGGER.Debug($"There are [{BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count}] SQLSearches configured!")
_DTSQLSearches = BASEDATA_DT_PROFILE_SEARCHES_SQL
Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID")
Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND")
@@ -695,6 +696,7 @@ Public Class frmValidatorSearch
Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE"))
End If
If DT_FILTERED_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
+ LOGGER.Debug($"There are [{DT_FILTERED_PROFILE_SEARCHES_DOC.Rows.Count}] DocSearches configured!")
_DTDocSearches = DT_FILTERED_PROFILE_SEARCHES_DOC
Dim oConID = DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID")
Dim oCommand = DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND")