diff --git a/app/DD_PM_WINDREAM/ClassParamRefresh.vb b/app/DD_PM_WINDREAM/ClassParamRefresh.vb index 5c48f66..d6a9d54 100644 --- a/app/DD_PM_WINDREAM/ClassParamRefresh.vb +++ b/app/DD_PM_WINDREAM/ClassParamRefresh.vb @@ -84,6 +84,7 @@ ElseIf oMode.StartsWith("PM.INACTIVITY_DURATION") Then Dim oInactivityDuration = oMode.Replace("PM.INACTIVITY_DURATION=", "") Try + INACTIVITY_DURATION = CInt(oInactivityDuration) LOGGER.Info($"InactivityDuration [{INACTIVITY_DURATION}]") Catch ex As Exception diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index f2d4c55..0b655c5 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_PM_WINDREAM/frmGhostMode.vb b/app/DD_PM_WINDREAM/frmGhostMode.vb index 41d6678..6255665 100644 --- a/app/DD_PM_WINDREAM/frmGhostMode.vb +++ b/app/DD_PM_WINDREAM/frmGhostMode.vb @@ -3,8 +3,18 @@ Dim oSQL = "SELECT CONFIG_VALUE FROM TBIDB_BASE WHERE CONFIG_NAME = 'GHOST_SELECT'" oSQL = ClassDatabase.Execute_Scalar_ConStr(oSQL, CONNECTION_STRING_IDB, "frmGhostMode_Load") Dim DT_USER = ClassDatabase.Return_Datatable(oSQL, "frmGhostMode_LoadDT") + If IsNothing(DT_USER) Then + oSQL = "SELECT [SQL_COMMAND] FROM TBDD_SQL_COMMANDS where TITLE = 'GHOST_SELECT'" + If Not IsNothing(oSQL) Then + oSQL = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) + DT_USER = ClassDatabase.Return_Datatable(oSQL, "frmGhostMode_LoadDT2") + Else + MsgBox("No SQL for Ghostmode via DD_ECM. Check Your configuration.", MsgBoxStyle.Exclamation) + Exit Sub + End If + End If - Try + Try If Not IsNothing(DT_USER) Then GridControl1.DataSource = DT_USER End If diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 326bd50..1433c47 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAYABBwGAAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAYgBBwGIAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 4737c1c..ab02eda 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -1273,6 +1273,7 @@ Public Class frmMain If CURRENT_DT_PROFILE.Rows.Count = 1 Then CURRENT_ProfilName = CURRENT_DT_PROFILE.Rows(0).Item("NAME") Else + MsgBox("Could not get a Profile - Check Your log!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) Exit Sub End If @@ -1295,9 +1296,6 @@ Public Class frmMain MsgBox(ex.Message, MsgBoxStyle.Critical, ADDITIONAL_TITLE) End Try - - 'Decide_Load() - Try Dim iterateIndex As Integer = 0 Dim oNewDataTable As DataTable = CURR_DT_OVERVIEW.Copy @@ -1368,8 +1366,7 @@ Public Class frmMain End Sub Private Sub Item_Scope(startedFrom As String) Try - CURRENT_CLICKED_PROFILE_TITLE = Nothing - CURRENT_CLICKED_PROFILE_ID = Nothing + If Application.OpenForms().OfType(Of frmValidator).Any Then bsiMessage.Caption = "There is already an active workflow!" LOGGER.Info("Item Scope - Workflow open! - Exit") @@ -1413,10 +1410,13 @@ Public Class frmMain OItemScopeInfo = $"NOT GRID_LOAD_TYPE = OVERVIEW" LOGGER.Debug($"Item_Scope: NOT GRID_LOAD_TYPE = OVERVIEW") If IsNothing(CURRENT_CLICKED_PROFILE_ID) = False Then + If CURRENT_CLICKED_PROFILE_ID = 0 Then + LOGGER.Info("ItemScope: CURRENT_CLICKED_PROFILE_ID = 0!!!") + End If LOGGER.Debug($"Item_Scope: CURRENT_CLICKED_PROFILE_ID [{CURRENT_CLICKED_PROFILE_ID}]") oHitProfilID = CURRENT_CLICKED_PROFILE_ID Else - LOGGER.Warn("In ItemScope: CURRENT_CLICKED_PROFILE_ID is nothing!!!") + LOGGER.Warn("ItemScope: CURRENT_CLICKED_PROFILE_ID is nothing!!!") Exit Sub End If @@ -1443,7 +1443,10 @@ Public Class frmMain CURRENT_CLICKED_PROFILE_TITLE = PROFIL_TITLE End If If Len(oHitProfilID) > 0 Then - CURRENT_CLICKED_PROFILE_ID = oHitProfilID + If oHitProfilID > 0 Then + CURRENT_CLICKED_PROFILE_ID = oHitProfilID + End If + End If If Not IsNothing(CURRENT_CLICKED_PROFILE_ID) And IsNumeric(CURRENT_CLICKED_PROFILE_ID) Then @@ -1483,15 +1486,15 @@ Public Class frmMain DOC_PATH = DOC_PATH.Replace("K:\", "\\windream\objects\") 'Checking if table really contains one record with profile-id and docid expression = expression & " AND DocID = " & oFocusedDocID - Dim TEMP_TABLE = CURR_DT_OVERVIEW - Dim foundRows() As DataRow - foundRows = TEMP_TABLE.Select(expression) - Dim result = 0 - For i = 0 To foundRows.GetUpperBound(0) - result += 1 - Next - If result = 1 Then - CURRENT_DOC_ID = oFocusedDocID + 'Dim TEMP_TABLE = CURR_DT_OVERVIEW + 'Dim foundRows() As DataRow + 'foundRows = TEMP_TABLE.Select(expression) + 'Dim result = 0 + 'For i = 0 To foundRows.GetUpperBound(0) + 'result += 1 + 'Next + 'If result = 1 Then + CURRENT_DOC_ID = oFocusedDocID CURRENT_JUMP_DOC_GUID = oFocusedDocGUID CURRENT_DOC_GUID = CURRENT_JUMP_DOC_GUID CURRENT_DOC_PATH = DOC_PATH @@ -1513,9 +1516,10 @@ Public Class frmMain LOGGER.Warn($"Uenxpected error in Checking freefile - sql so far: {oSQL} - ") End Try - Else - Exit Sub - End If + 'Else + 'LOGGER.Warn($"Unable to load Object DocID {CURRENT_DOC_ID} and DocGUID {CURRENT_JUMP_DOC_GUID}: Expression returned 0 [{expression}]") + 'Exit Sub + 'End If End If Else diff --git a/app/SetupVS19/SetupVS19.wixproj b/app/SetupVS19/SetupVS19.wixproj index 2d85d00..32d1e80 100644 --- a/app/SetupVS19/SetupVS19.wixproj +++ b/app/SetupVS19/SetupVS19.wixproj @@ -18,6 +18,7 @@ bin\$(Configuration)\ obj\$(Configuration)\ + -b "$(SolutionDir)DD_PM_WINDREAM\bin\$(Configuration)"