V1 - Anpassung frmValidator Logik Massenbarbeitung

This commit is contained in:
Developer01 2025-09-09 11:25:37 +02:00
parent daf1c16b30
commit d7520ac86a
2 changed files with 46 additions and 42 deletions

View File

@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.6.0.0")> <Assembly: AssemblyVersion("2.6.1.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguage("")> <Assembly: NeutralResourcesLanguage("")>

View File

@ -452,11 +452,9 @@ Public Class frmValidator
End If End If
End If End If
bbtniNext.Visibility = BarItemVisibility.Always
If CURRENT_JUMP_DOC_GUID <> 0 Then
bbtniNext.Visibility = BarItemVisibility.Never bbtniNext.Visibility = BarItemVisibility.Never
If CURRENT_JUMP_DOC_GUID <> 0 Then
Amount_Docs2Validate = 1 Amount_Docs2Validate = 1
Else Else
@ -2290,8 +2288,8 @@ Public Class frmValidator
' Logger.Error(ex) ' Logger.Error(ex)
' End Try ' End Try
'End Sub 'End Sub
Private Sub Controls2B_EnDisabled_on_Load() Private Sub Controls2B_EnDisabled()
If LOG_PERF Then PerformanceLogger.Info("Controls2B_EnDisabled_on_Load") If LOG_PERF Then PerformanceLogger.Info("Controls2B_EnDisabled")
Try Try
Dim oFilteredDatatable As DataTable = DT_CONTROLS.Clone() Dim oFilteredDatatable As DataTable = DT_CONTROLS.Clone()
@ -2318,8 +2316,10 @@ Public Class frmValidator
Try Try
MyValidationLogger.Debug($"Result of Enable SQL [{oResult}]...") MyValidationLogger.Debug($"Result of Enable SQL [{oResult}]...")
oControl.Enabled = oResult
oControl.Enabled = CBool(oResult)
Catch ex As Exception Catch ex As Exception
MyValidationLogger.Warn($"Could not convert value [oResult] to Boolean!")
MyValidationLogger.Warn($"Error en/disabling control onLoad: [{ex.Message}]") MyValidationLogger.Warn($"Error en/disabling control onLoad: [{ex.Message}]")
End Try End Try
@ -2677,14 +2677,16 @@ Public Class frmValidator
DatabaseFallback.ExecuteNonQueryECM(sql) DatabaseFallback.ExecuteNonQueryECM(sql)
' ############ Infos eintragen ################# ' ############ Infos eintragen #################
' txtDateipfad.Text = Document_Path
'Dim omsg = $"{ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("remainingOps")}: {Amount_Docs2Validate}"
Dim omsg = String.Format(S.Verbleibende_Vorgänge___0_, Amount_Docs2Validate)
If Amount_Docs2Validate > 0 Then If Amount_Docs2Validate > 1 Then
Dim omsg = String.Format(S.Verbleibende_Vorgänge___0_, Amount_Docs2Validate)
bsiInformation.Caption = omsg bsiInformation.Caption = omsg
If RbnPgGrpActions.Visible = False Then
RbnPgGrpActions.Visible = True
End If
bbtniNext.Visibility = BarItemVisibility.Always
Else Else
bsiInformation.Caption = "Could not get the amount of remaining docs!" bbtniNext.Visibility = BarItemVisibility.Never
End If End If
bsiDocID.Caption = "Document-ID: " & CURRENT_DOC_ID & " - GUID: " & CURRENT_DOC_GUID bsiDocID.Caption = "Document-ID: " & CURRENT_DOC_ID & " - GUID: " & CURRENT_DOC_GUID
@ -2831,7 +2833,7 @@ Public Class frmValidator
Catch ex As Exception Catch ex As Exception
MyValidationLogger.Error(ex) MyValidationLogger.Error(ex)
End Try End Try
Controls2B_EnDisabled()
MyValidationLogger.Debug("frmValidator: LoadNextDocument finished!") MyValidationLogger.Debug("frmValidator: LoadNextDocument finished!")
Catch ex As Exception Catch ex As Exception
@ -4012,7 +4014,6 @@ Public Class frmValidator
' Refresh_FileList() ' Refresh_FileList()
Load_Next_Document(True) Load_Next_Document(True)
Controls2B_EnDisabled_on_Load()
_DependingControl_In_Action = False _DependingControl_In_Action = False
_DependingColumn_In_Action = False _DependingColumn_In_Action = False
@ -4228,7 +4229,7 @@ Public Class frmValidator
End Function End Function
Sub Finish_WFStep(Optional includeFI As Boolean = True) Sub Finish_WFStep(Optional includeFI As Boolean = True)
btnSave.Enabled = False btnSave.Enabled = False
MyValidationLogger.Debug("Abschluss für Dok: " & CURRENT_DOC_PATH & " gestartet") MyValidationLogger.Debug("Abschluss für DocID " & CURRENT_DOC_ID & " wird gestartet ...")
_ItemWorked = True _ItemWorked = True
Dim oErrorOcurred As Boolean = False Dim oErrorOcurred As Boolean = False
If OverrideAll = False Then If OverrideAll = False Then
@ -4500,6 +4501,7 @@ Public Class frmValidator
DatabaseFallback.ExecuteNonQueryECM(ins) DatabaseFallback.ExecuteNonQueryECM(ins)
Dim oFIsql As String Dim oFIsql As String
'Close_document_viewer() 'Close_document_viewer()
If Not IsNothing(Current_Document) Then
If Current_Document.Extension = "pdf" Then If Current_Document.Extension = "pdf" Then
If Not IsNothing(WORK_HISTORY_ENTRY) Then If Not IsNothing(WORK_HISTORY_ENTRY) Then
If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
@ -4528,6 +4530,8 @@ Public Class frmValidator
End If End If
End If End If
End If End If
End If
'wenn Move2Folder aktiviert wurde 'wenn Move2Folder aktiviert wurde
If Move2Folder <> "" And (OPERATION_MODE_FS = ClassConstants.OpModeFS_PWM Or OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM) Then If Move2Folder <> "" And (OPERATION_MODE_FS = ClassConstants.OpModeFS_PWM Or OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM) Then