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

MS Bugfixing1

Browse Source
This commit is contained in:
Digital Data - Marlon Schreiber
2018-06-12 15:15:33 +02:00
parent 146bf5de5c
commit 8f0ddba69f
9 changed files with 165 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/DD_PM_WINDREAM/frmMassValidator.vb
View File

@@ -4,7 +4,6 @@ Imports System.ComponentModel
Imports DD_LIB_Standards
Public Class frmMassValidator
Dim DT_PROFIL As DataTable
Dim DT_PROFILE_CONTROLS As DataTable
Private Delimiter As String
@@ -45,7 +44,6 @@ Public Class frmMassValidator
Size = My.Settings.frmMassValidatorSize
End If
Try
DT_PROFIL = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID)
DT_PROFILE_CONTROLS = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_PROFILE_CONTROLS WHERE CTRL_TYPE <> 'TABLE' AND SQL_UEBERPRUEFUNG NOT LIKE '%WMI%' AND PROFIL_ID = " & CURRENT_ProfilGUID)
If LogErrorsOnly = False Then ClassLogger.Add(" >> Profile Data geladen", False)
Catch ex As Exception
@@ -57,17 +55,17 @@ Public Class frmMassValidator
' Try
Delimiter = CURRENT_DT_CONFIG.Rows(0).Item("VEKTOR_DELIMITER")
If DT_PROFIL.Rows.Count = 0 Then
If CURRENT_DT_PROFILE.Rows.Count = 0 Then
ClassLogger.Add(">> Profildaten konnten nicht geladen werden - Übergebenes Profil: : " & CURRENT_ProfilName, True)
MsgBox("Achtung: Profildaten konnten nicht übergeben oder geladen werden.", MsgBoxStyle.Critical, "Achtung:")
Me.Close()
End If
If DT_PROFIL.Rows.Count > 1 Then
If CURRENT_DT_PROFILE.Rows.Count > 1 Then
MsgBox("Es wurden mehr als 1 Profil zurückgegeben!!", MsgBoxStyle.Critical, "Achtung:")
Me.Close()
Else
If DT_PROFIL.Rows.Count <> 0 Then
For Each dr In DT_PROFIL.Rows
If CURRENT_DT_PROFILE.Rows.Count = 1 Then
For Each dr In CURRENT_DT_PROFILE.Rows
PROFIL_VEKTORINDEX = dr.Item("PM_VEKTOR_INDEX")
PROFIL_LOGINDEX = dr.Item("LOG_INDEX")
Me.Text = "Process Manager - " & dr.Item("TITLE")
@@ -928,7 +926,7 @@ Public Class frmMassValidator
Dim WORK_HISTORY_ENTRY = Nothing
Try
WORK_HISTORY_ENTRY = DT_PROFIL.Rows(0).Item("WORK_HISTORY_ENTRY")
WORK_HISTORY_ENTRY = CURRENT_DT_PROFILE.Rows(0).Item("WORK_HISTORY_ENTRY")
If IsDBNull(WORK_HISTORY_ENTRY) Then
WORK_HISTORY_ENTRY = Nothing
End If
@@ -1013,7 +1011,7 @@ Public Class frmMassValidator
'####### ANNOTIEREN WENN KONFIGURIERT #######
If docrow.Item("FULL_PATH").ToString.ToLower.EndsWith(".pdf") Then
If Not IsNothing(WORK_HISTORY_ENTRY) Then
If CBool(DT_PROFIL.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
If CBool(CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
Dim Sql = 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 = ClassDatabase.Return_Datatable(Sql, True)
If Not IsNothing(DT_ENTRY) Then
@@ -1023,7 +1021,7 @@ Public Class frmMassValidator
End If
End If
End If
Dim value = DT_PROFIL.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
Dim value = CURRENT_DT_PROFILE.Rows(0).Item("ANNOTATE_ALL_WORK_HISTORY_ENTRIES")
If CBool(value) = True Then
Dim Sql = 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 = ClassDatabase.Return_Datatable(Sql, True)