AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Übernahme frmValidator-Logik aus Bugfix 2.6.1

Browse Source
This commit is contained in:
Developer01 2025-09-09 11:26:49 +02:00
parent 0eb480b427
commit fd2f59af04
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
app/TaskFlow/frmValidator.vb
View File

@ -2289,7 +2289,7 @@ Public Class frmValidator
' End Try ' End Try
'End Sub 'End Sub
Private Sub Controls2B_EnDisabled() 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()
@ -2678,12 +2678,14 @@ Public Class frmValidator
' ############ Infos eintragen ################# ' ############ Infos eintragen #################
If Amount_Docs2Validate > 0 Then If Amount_Docs2Validate > 1 Then
Dim omsg = String.Format(S.Verbleibende_Vorgänge___0_, Amount_Docs2Validate) 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 bbtniNext.Visibility = BarItemVisibility.Always
Else Else
bsiInformation.Caption = "Could not get the amount of remaining docs!"
bbtniNext.Visibility = BarItemVisibility.Never bbtniNext.Visibility = BarItemVisibility.Never
End If End If
@ -4227,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
@ -4499,35 +4501,38 @@ Public Class frmValidator
DatabaseFallback.ExecuteNonQueryECM(ins) DatabaseFallback.ExecuteNonQueryECM(ins)
Dim oFIsql As String Dim oFIsql As String
'Close_document_viewer() 'Close_document_viewer()
If Current_Document.Extension = "pdf" Then If Not IsNothing(Current_Document) Then
If Not IsNothing(WORK_HISTORY_ENTRY) Then If Current_Document.Extension = "pdf" Then
If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then If Not IsNothing(WORK_HISTORY_ENTRY) Then
oFIsql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE GUID = (SELECT MAX(GUID) FROM TBPM_FILES_WORK_HISTORY WHERE PROFIL_ID = {0} AND DOC_ID = {1})", CURRENT_ProfilGUID, CURRENT_DOC_ID) If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
Dim DT_ENTRY As DataTable = DatabaseFallback.GetDatatableECM(oFIsql) ', "Finish_WFStep2") oFIsql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE GUID = (SELECT MAX(GUID) FROM TBPM_FILES_WORK_HISTORY WHERE PROFIL_ID = {0} AND DOC_ID = {1})", CURRENT_ProfilGUID, CURRENT_DOC_ID)
If Not IsNothing(DT_ENTRY) Then Dim DT_ENTRY As DataTable = DatabaseFallback.GetDatatableECM(oFIsql) ', "Finish_WFStep2")
If DT_ENTRY.Rows.Count = 1 Then If Not IsNothing(DT_ENTRY) Then
Dim AnnotationString = DT_ENTRY.Rows(0).Item("WORKED_WHEN") & " " & DT_ENTRY.Rows(0).Item("WORKED_BY") & ": " & DT_ENTRY.Rows(0).Item("STATUS_COMMENT") If DT_ENTRY.Rows.Count = 1 Then
ClassAnnotation.Annotate_PDF("Workflow-State:", AnnotationString, 0, False) Dim AnnotationString = DT_ENTRY.Rows(0).Item("WORKED_WHEN") & " " & DT_ENTRY.Rows(0).Item("WORKED_BY") & ": " & DT_ENTRY.Rows(0).Item("STATUS_COMMENT")
ClassAnnotation.Annotate_PDF("Workflow-State:", AnnotationString, 0, False)
End If
End If End If
End If End If
End If Dim oAnnotateAllWHEs = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
Dim oAnnotateAllWHEs = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES") If CBool(oAnnotateAllWHEs) = True Then
If CBool(oAnnotateAllWHEs) = True Then oFIsql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE DOC_ID = {1} ORDER BY GUID", CURRENT_ProfilGUID, CURRENT_DOC_ID)
oFIsql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE DOC_ID = {1} ORDER BY GUID", CURRENT_ProfilGUID, CURRENT_DOC_ID) Dim DT_ENTRIES As DataTable = DatabaseFallback.GetDatatableECM(oFIsql) ', "Finish_WFStep3")
Dim DT_ENTRIES As DataTable = DatabaseFallback.GetDatatableECM(oFIsql) ', "Finish_WFStep3") If Not IsNothing(DT_ENTRIES) Then
If Not IsNothing(DT_ENTRIES) Then If DT_ENTRIES.Rows.Count > 0 Then
If DT_ENTRIES.Rows.Count > 0 Then Dim AnnotationString As String = ""
Dim AnnotationString As String = "" For Each rw As DataRow In DT_ENTRIES.Rows
For Each rw As DataRow In DT_ENTRIES.Rows AnnotationString = AnnotationString & rw.Item("WORKED_WHEN") & " " & rw.Item("WORKED_BY") & ": " & rw.Item("STATUS_COMMENT") & vbNewLine
AnnotationString = AnnotationString & rw.Item("WORKED_WHEN") & " " & rw.Item("WORKED_BY") & ": " & rw.Item("STATUS_COMMENT") & vbNewLine Next
Next ClassAnnotation.Annotate_PDF("Workflow History:", AnnotationString, 0, False, 10, 40)
ClassAnnotation.Annotate_PDF("Workflow History:", AnnotationString, 0, False, 10, 40) End If
End If End If
End If 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
idxerr_message = allgFunk.Move2Folder(WMDocPathWindows, Move2Folder, CURRENT_ProfilGUID, WINDREAM_ALLG) idxerr_message = allgFunk.Move2Folder(WMDocPathWindows, Move2Folder, CURRENT_ProfilGUID, WINDREAM_ALLG)