V1 - Anpassung frmValidator Logik Massenbarbeitung
This commit is contained in:
Developer01
parent
daf1c16b30
commit
d7520ac86a
@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.6.0.0")>
|
||||
<Assembly: AssemblyVersion("2.6.1.0")>
|
||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||
<Assembly: NeutralResourcesLanguage("")>
|
||||
|
||||
@ -452,11 +452,9 @@ Public Class frmValidator
|
||||
End If
|
||||
End If
|
||||
|
||||
bbtniNext.Visibility = BarItemVisibility.Always
|
||||
|
||||
bbtniNext.Visibility = BarItemVisibility.Never
|
||||
If CURRENT_JUMP_DOC_GUID <> 0 Then
|
||||
bbtniNext.Visibility = BarItemVisibility.Never
|
||||
|
||||
Amount_Docs2Validate = 1
|
||||
Else
|
||||
|
||||
@ -2290,8 +2288,8 @@ Public Class frmValidator
|
||||
' Logger.Error(ex)
|
||||
' End Try
|
||||
'End Sub
|
||||
Private Sub Controls2B_EnDisabled_on_Load()
|
||||
If LOG_PERF Then PerformanceLogger.Info("Controls2B_EnDisabled_on_Load")
|
||||
Private Sub Controls2B_EnDisabled()
|
||||
If LOG_PERF Then PerformanceLogger.Info("Controls2B_EnDisabled")
|
||||
|
||||
Try
|
||||
Dim oFilteredDatatable As DataTable = DT_CONTROLS.Clone()
|
||||
@ -2318,8 +2316,10 @@ Public Class frmValidator
|
||||
|
||||
Try
|
||||
MyValidationLogger.Debug($"Result of Enable SQL [{oResult}]...")
|
||||
oControl.Enabled = oResult
|
||||
|
||||
oControl.Enabled = CBool(oResult)
|
||||
Catch ex As Exception
|
||||
MyValidationLogger.Warn($"Could not convert value [oResult] to Boolean!")
|
||||
MyValidationLogger.Warn($"Error en/disabling control onLoad: [{ex.Message}]")
|
||||
End Try
|
||||
|
||||
@ -2677,14 +2677,16 @@ Public Class frmValidator
|
||||
DatabaseFallback.ExecuteNonQueryECM(sql)
|
||||
|
||||
' ############ 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
|
||||
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
|
||||
|
||||
bsiDocID.Caption = "Document-ID: " & CURRENT_DOC_ID & " - GUID: " & CURRENT_DOC_GUID
|
||||
@ -2831,7 +2833,7 @@ Public Class frmValidator
|
||||
Catch ex As Exception
|
||||
MyValidationLogger.Error(ex)
|
||||
End Try
|
||||
|
||||
Controls2B_EnDisabled()
|
||||
|
||||
MyValidationLogger.Debug("frmValidator: LoadNextDocument finished!")
|
||||
Catch ex As Exception
|
||||
@ -2898,13 +2900,13 @@ Public Class frmValidator
|
||||
End If
|
||||
SplitContainer1.Panel2Collapsed = True
|
||||
If Not IsNothing(DocumentViewer1) Then
|
||||
DocumentViewer1.Visible = False
|
||||
End If
|
||||
DocumentViewer1.Visible = False
|
||||
End If
|
||||
|
||||
RibbonPageFile.Visible = False
|
||||
Exit Sub
|
||||
Else
|
||||
If Not IsNothing(DocumentViewer1) Then
|
||||
RibbonPageFile.Visible = False
|
||||
Exit Sub
|
||||
Else
|
||||
If Not IsNothing(DocumentViewer1) Then
|
||||
DocumentViewer1.Visible = True
|
||||
End If
|
||||
|
||||
@ -4012,7 +4014,6 @@ Public Class frmValidator
|
||||
' Refresh_FileList()
|
||||
Load_Next_Document(True)
|
||||
|
||||
Controls2B_EnDisabled_on_Load()
|
||||
_DependingControl_In_Action = False
|
||||
_DependingColumn_In_Action = False
|
||||
|
||||
@ -4228,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
|
||||
@ -4500,35 +4501,38 @@ Public Class frmValidator
|
||||
DatabaseFallback.ExecuteNonQueryECM(ins)
|
||||
Dim oFIsql As String
|
||||
'Close_document_viewer()
|
||||
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
|
||||
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)
|
||||
Dim DT_ENTRY As DataTable = DatabaseFallback.GetDatatableECM(oFIsql) ', "Finish_WFStep2")
|
||||
If Not IsNothing(DT_ENTRY) Then
|
||||
If DT_ENTRY.Rows.Count = 1 Then
|
||||
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)
|
||||
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
|
||||
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)
|
||||
Dim DT_ENTRY As DataTable = DatabaseFallback.GetDatatableECM(oFIsql) ', "Finish_WFStep2")
|
||||
If Not IsNothing(DT_ENTRY) Then
|
||||
If DT_ENTRY.Rows.Count = 1 Then
|
||||
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
|
||||
Dim oAnnotateAllWHEs = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
|
||||
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)
|
||||
Dim DT_ENTRIES As DataTable = DatabaseFallback.GetDatatableECM(oFIsql) ', "Finish_WFStep3")
|
||||
If Not IsNothing(DT_ENTRIES) Then
|
||||
If DT_ENTRIES.Rows.Count > 0 Then
|
||||
Dim AnnotationString As String = ""
|
||||
For Each rw As DataRow In DT_ENTRIES.Rows
|
||||
AnnotationString = AnnotationString & rw.Item("WORKED_WHEN") & " " & rw.Item("WORKED_BY") & ": " & rw.Item("STATUS_COMMENT") & vbNewLine
|
||||
Next
|
||||
ClassAnnotation.Annotate_PDF("Workflow History:", AnnotationString, 0, False, 10, 40)
|
||||
Dim oAnnotateAllWHEs = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
|
||||
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)
|
||||
Dim DT_ENTRIES As DataTable = DatabaseFallback.GetDatatableECM(oFIsql) ', "Finish_WFStep3")
|
||||
If Not IsNothing(DT_ENTRIES) Then
|
||||
If DT_ENTRIES.Rows.Count > 0 Then
|
||||
Dim AnnotationString As String = ""
|
||||
For Each rw As DataRow In DT_ENTRIES.Rows
|
||||
AnnotationString = AnnotationString & rw.Item("WORKED_WHEN") & " " & rw.Item("WORKED_BY") & ": " & rw.Item("STATUS_COMMENT") & vbNewLine
|
||||
Next
|
||||
ClassAnnotation.Annotate_PDF("Workflow History:", AnnotationString, 0, False, 10, 40)
|
||||
End If
|
||||
End If
|
||||
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
|
||||
idxerr_message = allgFunk.Move2Folder(WMDocPathWindows, Move2Folder, CURRENT_ProfilGUID, WINDREAM_ALLG)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user