Validator NotResponible mit oder ohne override/inlcude FI

This commit is contained in:
Developer01 2025-12-03 14:11:30 +01:00
parent eef779ab09
commit 4554c5841d
3 changed files with 15 additions and 25 deletions

View File

@ -3299,7 +3299,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
LOGGER.Debug($"oTargetPath with NowParams: {oTargetPath}") LOGGER.Debug($"oTargetPath with NowParams: {oTargetPath}")
Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype, True) Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype)
If oResult = True Then If oResult = True Then
WM_AHWF_docPath = oTargetPath WM_AHWF_docPath = oTargetPath
Dim oDocID = WINDREAM_MOD.NewDocumentID Dim oDocID = WINDREAM_MOD.NewDocumentID

View File

@ -1345,6 +1345,7 @@ Public Class frmValidator
Dim oTitle Dim oTitle
Dim oCaption Dim oCaption
Dim oColor Dim oColor
Dim oIncludeFI As Boolean = False
Try Try
oAction = oDT_ACTIONS?.Rows(0).Item("ActionType") oAction = oDT_ACTIONS?.Rows(0).Item("ActionType")
Catch ex As Exception Catch ex As Exception
@ -1375,12 +1376,17 @@ Public Class frmValidator
Catch ex As Exception Catch ex As Exception
oColor = "" oColor = ""
End Try End Try
Try
oIncludeFI = oDT_ACTIONS?.Rows(0).Item("IncludeFI")
Catch ex As Exception
End Try
Try Try
OverrideAll = oDT_ACTIONS?.Rows(0).Item("OverrideAll") OverrideAll = oDT_ACTIONS?.Rows(0).Item("OverrideAll")
Catch ex As Exception Catch ex As Exception
MyValidationLogger.Warn($"Could not set OverrideAll {ex.Message}") MyValidationLogger.Warn($"Could not set OverrideAll {ex.Message}")
OverrideAll = False OverrideAll = False
End Try End Try
If OverrideAll = True Then If OverrideAll = True Then
MyValidationLogger.Info($"CURRENT_DOC_ID: {CURRENT_DOC_ID} - OverrideAll will be in Action!") MyValidationLogger.Info($"CURRENT_DOC_ID: {CURRENT_DOC_ID} - OverrideAll will be in Action!")
End If End If
@ -1395,7 +1401,7 @@ Public Class frmValidator
result = MessageBox.Show(oQuestion, oTitle, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) result = MessageBox.Show(oQuestion, oTitle, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation)
If result = MsgBoxResult.Yes Then If result = MsgBoxResult.Yes Then
Override = True Override = True
Finish_WFStep() Finish_WFStep(oIncludeFI)
End If End If
End If End If
Case "Update_Single_Control".ToUpper Case "Update_Single_Control".ToUpper
@ -1441,7 +1447,7 @@ Public Class frmValidator
Case "Override_Direct".ToUpper Case "Override_Direct".ToUpper
Override = True Override = True
If Check_UpdateIndexe() = True Then If Check_UpdateIndexe() = True Then
Finish_WFStep(False) Finish_WFStep(oIncludeFI)
End If End If
Case "Override incFinal".ToUpper Case "Override incFinal".ToUpper
@ -6359,11 +6365,8 @@ Public Class frmValidator
Indexiere_File(CURRENT_WMFILE, PROFIL_NOT_RESP_COMMENT_ATTR, frmDialog.oComment) Indexiere_File(CURRENT_WMFILE, PROFIL_NOT_RESP_COMMENT_ATTR, frmDialog.oComment)
Else Else
Dim oREsult = IDBData.SetVariableValue(PROFIL_NOT_RESP_COMMENT_ATTR, frmDialog.oComment) Dim oREsult = IDBData.SetVariableValue(PROFIL_NOT_RESP_COMMENT_ATTR, frmDialog.oComment)
End If End If
Finish_WFStep(oIncludeFI)
Finish_WFStep()
End If End If
End Sub End Sub

View File

@ -456,32 +456,19 @@ Public Class frmValidatorSearch
End If End If
End If End If
If My.Settings.frmValidatorSearchSize.IsEmpty = False Then If My.Settings.frmValidatorSearchSize.IsEmpty = False Then
If My.Settings.frmValidatorSearchSize.Height > 100 And My.Settings.frmValidatorSearchSize.Width > 100 Then If My.Settings.frmValidatorSearchSize.Height > 120 And My.Settings.frmValidatorSearchSize.Width > 120 Then
Me.Size = My.Settings.frmValidatorSearchSize Me.Size = My.Settings.frmValidatorSearchSize
End If End If
End If End If
SplitContainerSearches.SplitterDistance = My.Settings.frmValSearchSplitterDistance If My.Settings.frmValSearchSplitterDistance > 20 Then
SplitContainerSearches.SplitterDistance = My.Settings.frmValSearchSplitterDistance
End If
ToolStripDropDownButtonFile.Visible = False ToolStripDropDownButtonFile.Visible = False
End Sub End Sub
Private Sub frmValidatorSearch_Shown(sender As Object, e As EventArgs) Handles Me.Shown Private Sub frmValidatorSearch_Shown(sender As Object, e As EventArgs) Handles Me.Shown
Try
If My.Settings.frmValidatorSearchPosition.X > 0 And My.Settings.frmValidatorSearchPosition.Y > 0 Then
Me.Location = My.Settings.frmValidatorSearchPosition
End If
If Me.Size.Height > 100 And Me.Size.Width > 100 Then
Me.Size = My.Settings.frmValidatorSearchSize
Else
Me.Size = New Size(500, 800)
End If
SplitContainerSearches.SplitterDistance = My.Settings.frmValSearchSplitterDistance
Catch ex As Exception
LOGGER.Error(ex)
End Try
formLoaded = True formLoaded = True
End Sub End Sub