Übernahme frmValidator-Logik aus Bugfix 2.6.1
This commit is contained in:
parent
0eb480b427
commit
fd2f59af04
@ -2289,7 +2289,7 @@ Public Class frmValidator
|
||||
' End Try
|
||||
'End Sub
|
||||
Private Sub Controls2B_EnDisabled()
|
||||
If LOG_PERF Then PerformanceLogger.Info("Controls2B_EnDisabled_on_Load")
|
||||
If LOG_PERF Then PerformanceLogger.Info("Controls2B_EnDisabled")
|
||||
|
||||
Try
|
||||
Dim oFilteredDatatable As DataTable = DT_CONTROLS.Clone()
|
||||
@ -2678,12 +2678,14 @@ Public Class frmValidator
|
||||
|
||||
' ############ Infos eintragen #################
|
||||
|
||||
If Amount_Docs2Validate > 0 Then
|
||||
If Amount_Docs2Validate > 1 Then
|
||||
Dim omsg = String.Format(S.Verbleibende_Vorgänge___0_, Amount_Docs2Validate)
|
||||
bsiInformation.Caption = omsg
|
||||
If RbnPgGrpActions.Visible = False Then
|
||||
RbnPgGrpActions.Visible = True
|
||||
End If
|
||||
bbtniNext.Visibility = BarItemVisibility.Always
|
||||
Else
|
||||
bsiInformation.Caption = "Could not get the amount of remaining docs!"
|
||||
bbtniNext.Visibility = BarItemVisibility.Never
|
||||
End If
|
||||
|
||||
@ -4227,7 +4229,7 @@ Public Class frmValidator
|
||||
End Function
|
||||
Sub Finish_WFStep(Optional includeFI As Boolean = True)
|
||||
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
|
||||
Dim oErrorOcurred As Boolean = False
|
||||
If OverrideAll = False Then
|
||||
@ -4499,6 +4501,7 @@ Public Class frmValidator
|
||||
DatabaseFallback.ExecuteNonQueryECM(ins)
|
||||
Dim oFIsql As String
|
||||
'Close_document_viewer()
|
||||
If Not IsNothing(Current_Document) Then
|
||||
If Current_Document.Extension = "pdf" Then
|
||||
If Not IsNothing(WORK_HISTORY_ENTRY) Then
|
||||
If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
|
||||
@ -4527,6 +4530,8 @@ Public Class frmValidator
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
|
||||
|
||||
'wenn Move2Folder aktiviert wurde
|
||||
If Move2Folder <> "" And (OPERATION_MODE_FS = ClassConstants.OpModeFS_PWM Or OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM) Then
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user