diff --git a/app/TaskFlow.sln b/app/TaskFlow.sln index 93d8ea9..9ea3668 100644 --- a/app/TaskFlow.sln +++ b/app/TaskFlow.sln @@ -7,6 +7,8 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVS19", "SetupVS19\Setu EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "taskFLOW", "TaskFlow\taskFLOW.vbproj", "{6ACA1432-09A2-47EF-A704-C0AA73905756}" EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DocumentViewer", "..\..\..\2_DLL Projekte\Controls.DocumentViewer\DocumentViewer.vbproj", "{0958CDDF-4A16-41F6-8837-8335F71D599C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CD_ROM|Any CPU = CD_ROM|Any CPU @@ -61,6 +63,26 @@ Global {6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|Any CPU.Build.0 = Release|x86 {6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.ActiveCfg = Debug|x86 {6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.Build.0 = Debug|x86 + {0958CDDF-4A16-41F6-8837-8335F71D599C}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.CD_ROM|Any CPU.Build.0 = Release|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.CD_ROM|x86.ActiveCfg = Release|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.CD_ROM|x86.Build.0 = Release|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|x86.ActiveCfg = Debug|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|x86.Build.0 = Debug|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.DVD-5|Any CPU.ActiveCfg = Release|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.DVD-5|Any CPU.Build.0 = Release|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.DVD-5|x86.ActiveCfg = Release|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.DVD-5|x86.Build.0 = Release|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|Any CPU.Build.0 = Release|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|x86.ActiveCfg = Release|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|x86.Build.0 = Release|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.SingleImage|Any CPU.Build.0 = Release|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.SingleImage|x86.ActiveCfg = Release|Any CPU + {0958CDDF-4A16-41F6-8837-8335F71D599C}.SingleImage|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index e8394b7..8cde44c 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -4279,8 +4279,19 @@ Public Class frmValidator End Sub Private Sub frmValidation_Shown(sender As Object, e As System.EventArgs) Handles Me.Shown + Dim perfStart As DateTime = DateTime.MinValue + Dim perfLastCheck As DateTime = DateTime.MinValue + If LOG_HOTSPOTS Then + perfStart = DateTime.Now + perfLastCheck = perfStart + MyValidationLogger.Info("[PERF] frmValidation_Shown START") + End If ' Refresh_FileList() Load_Next_Document(True) + If LOG_HOTSPOTS Then + MyValidationLogger.Info($"[PERF] frmValidation_Shown nach Load_Next_Document: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + perfLastCheck = DateTime.Now + End If _DependingControl_In_Action = False _DependingColumn_In_Action = False @@ -4355,8 +4366,15 @@ Public Class frmValidator Catch ex As Exception MyValidationLogger.Error(ex) End Try + If LOG_HOTSPOTS Then + MyValidationLogger.Info($"[PERF] frmValidation_Shown nach Ribbon/Export Setup: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + perfLastCheck = DateTime.Now + End If MyValidationLogger.Debug("frmValidation_Shown finished!") + If LOG_HOTSPOTS Then + MyValidationLogger.Info($"[PERF] frmValidation_Shown GESAMT: {(DateTime.Now - perfStart).TotalMilliseconds}ms") + End If End Sub Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click btnSave.Enabled = False @@ -4513,18 +4531,34 @@ Public Class frmValidator End Function Sub Finish_WFStep(Optional includeFI As Boolean = True) + Dim perfStart As DateTime = DateTime.MinValue + Dim perfLastCheck As DateTime = DateTime.MinValue + If LOG_HOTSPOTS Then + perfStart = DateTime.Now + perfLastCheck = perfStart + MyValidationLogger.Info("[PERF] Finish_WFStep START") + End If btnSave.Enabled = False MyValidationLogger.Debug("Abschluss für DocID " & CURRENT_DOC_ID & " wird gestartet ...") Dim oErrorOcurred As Boolean = False If OverrideAll = False Then 'Eingaben auf Form überprüfen If Check_UpdateIndexe() = True Then + If LOG_HOTSPOTS Then + MyValidationLogger.Info($"[PERF] Finish_WFStep nach Check_UpdateIndexe: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + perfLastCheck = DateTime.Now + End If If PROFIL_FINISH_SQL <> String.Empty Then If btnFinish_continue() = False Then Exit Sub End If End If + If LOG_HOTSPOTS Then + MyValidationLogger.Info($"[PERF] Finish_WFStep nach btnFinish_continue: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + perfLastCheck = DateTime.Now + End If + If includeFI = True Then Try Dim oSQL = $"SELECT * FROM TBPM_PROFILE_FINAL_INDEXING WHERE PROFIL_ID = {CURRENT_ProfilGUID} AND ACTIVE = 1 ORDER BY SEQUENCE" @@ -4697,11 +4731,19 @@ Public Class frmValidator oErrorOcurred = True End Try End If + If LOG_HOTSPOTS AndAlso includeFI Then + MyValidationLogger.Info($"[PERF] Finish_WFStep nach FinalIndexing: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + perfLastCheck = DateTime.Now + End If Try ''Wenn kein Fehler nach der finalen Indexierung gesetzt wurde If Override = True And Override_SQLCommand <> "" Then DatabaseFallback.ExecuteNonQueryECM(Override_SQLCommand) End If + If LOG_HOTSPOTS Then + MyValidationLogger.Info($"[PERF] Finish_WFStep nach Override-SQL: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + perfLastCheck = DateTime.Now + End If If oErrorOcurred = False Then Dim WORK_HISTORY_ENTRY = Nothing @@ -4803,6 +4845,12 @@ Public Class frmValidator WORK_HISTORY_ENTRY = "" End If End If + + If LOG_HOTSPOTS Then + MyValidationLogger.Info($"[PERF] Finish_WFStep nach WORK_HISTORY: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + perfLastCheck = DateTime.Now + End If + Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, USER_USERNAME, System.Environment.MachineName, WORK_HISTORY_ENTRY) DatabaseFallback.ExecuteNonQueryECM(ins) Dim oFIsql As String @@ -4838,6 +4886,11 @@ Public Class frmValidator End If End If + If LOG_HOTSPOTS Then + MyValidationLogger.Info($"[PERF] Finish_WFStep nach Annotation: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + perfLastCheck = DateTime.Now + End If + 'wenn Move2Folder aktiviert wurde If Move2Folder <> "" And (OPERATION_MODE_FS = ClassConstants.OpModeFS_PWM Or OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM) Then @@ -4848,6 +4901,10 @@ Public Class frmValidator frmError.ShowDialog() oErrorOcurred = True End If + If LOG_HOTSPOTS Then + MyValidationLogger.Info($"[PERF] Finish_WFStep nach Move2Folder: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + perfLastCheck = DateTime.Now + End If End If @@ -4878,6 +4935,10 @@ Public Class frmValidator oErrorOcurred = True End If End If + If LOG_HOTSPOTS Then + MyValidationLogger.Info($"[PERF] Finish_WFStep nach OverrideAll-SQL: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + perfLastCheck = DateTime.Now + End If ' Wert muss für den nächsten Beleg wieder zurückgesetzt werden. OverrideAll = False End If @@ -4890,6 +4951,10 @@ Public Class frmValidator If DatabaseFallback.ExecuteNonQueryECM(oPROCSQL) = False Then MyValidationLogger.Warn($"Attention: Error executing proc [{oPROCSQL}]") End If + If LOG_HOTSPOTS Then + MyValidationLogger.Info($"[PERF] Finish_WFStep nach PRPM_CHECK_NEXT_WF: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + perfLastCheck = DateTime.Now + End If End If If CURRENT_JUMP_DOC_GUID <> 0 Then @@ -4898,12 +4963,19 @@ Public Class frmValidator Else 'Das nächste Dokument laden Load_Next_Document(False) + If LOG_HOTSPOTS Then + MyValidationLogger.Info($"[PERF] Finish_WFStep nach Load_Next_Document: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms") + perfLastCheck = DateTime.Now + End If Focus_FirstControl() End If btnSave.Enabled = True + If LOG_HOTSPOTS Then + MyValidationLogger.Info($"[PERF] Finish_WFStep GESAMT: {(DateTime.Now - perfStart).TotalMilliseconds}ms") + End If End Sub Sub Focus_FirstControl() If first_control Is Nothing = False Then