From 4554c5841dc14fb5c8fba9ad9fe1823eff83c364 Mon Sep 17 00:00:00 2001 From: Developer01 Date: Wed, 3 Dec 2025 14:11:30 +0100 Subject: [PATCH] Validator NotResponible mit oder ohne override/inlcude FI --- app/TaskFlow/frmMain.vb | 2 +- app/TaskFlow/frmValidator.vb | 15 +++++++++------ app/TaskFlow/frmValidatorSearch.vb | 23 +++++------------------ 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb index e22ca11..87758aa 100644 --- a/app/TaskFlow/frmMain.vb +++ b/app/TaskFlow/frmMain.vb @@ -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}") - Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype, True) + Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype) If oResult = True Then WM_AHWF_docPath = oTargetPath Dim oDocID = WINDREAM_MOD.NewDocumentID diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index 4c3f61c..c98daf0 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -1345,6 +1345,7 @@ Public Class frmValidator Dim oTitle Dim oCaption Dim oColor + Dim oIncludeFI As Boolean = False Try oAction = oDT_ACTIONS?.Rows(0).Item("ActionType") Catch ex As Exception @@ -1375,12 +1376,17 @@ Public Class frmValidator Catch ex As Exception oColor = "" End Try + Try + oIncludeFI = oDT_ACTIONS?.Rows(0).Item("IncludeFI") + Catch ex As Exception + End Try Try OverrideAll = oDT_ACTIONS?.Rows(0).Item("OverrideAll") Catch ex As Exception MyValidationLogger.Warn($"Could not set OverrideAll {ex.Message}") OverrideAll = False End Try + If OverrideAll = True Then MyValidationLogger.Info($"CURRENT_DOC_ID: {CURRENT_DOC_ID} - OverrideAll will be in Action!") End If @@ -1395,7 +1401,7 @@ Public Class frmValidator result = MessageBox.Show(oQuestion, oTitle, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) If result = MsgBoxResult.Yes Then Override = True - Finish_WFStep() + Finish_WFStep(oIncludeFI) End If End If Case "Update_Single_Control".ToUpper @@ -1441,7 +1447,7 @@ Public Class frmValidator Case "Override_Direct".ToUpper Override = True If Check_UpdateIndexe() = True Then - Finish_WFStep(False) + Finish_WFStep(oIncludeFI) End If Case "Override incFinal".ToUpper @@ -6359,11 +6365,8 @@ Public Class frmValidator Indexiere_File(CURRENT_WMFILE, PROFIL_NOT_RESP_COMMENT_ATTR, frmDialog.oComment) Else Dim oREsult = IDBData.SetVariableValue(PROFIL_NOT_RESP_COMMENT_ATTR, frmDialog.oComment) - End If - - - Finish_WFStep() + Finish_WFStep(oIncludeFI) End If End Sub diff --git a/app/TaskFlow/frmValidatorSearch.vb b/app/TaskFlow/frmValidatorSearch.vb index 0b11c33..22ca51c 100644 --- a/app/TaskFlow/frmValidatorSearch.vb +++ b/app/TaskFlow/frmValidatorSearch.vb @@ -456,32 +456,19 @@ Public Class frmValidatorSearch End If End If 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 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 End Sub 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 End Sub