diff --git a/.gitignore b/.gitignore index c7c5c91..250d752 100644 --- a/.gitignore +++ b/.gitignore @@ -155,3 +155,4 @@ $RECYCLE.BIN/ # Mac desktop service store files .DS_Store /app/.vs/DD_PM_WINDREAM/v15/Server/sqlite3 +/app/.vs/DD_PM_WINDREAM/v16/Server/sqlite3 diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index ffa541d..7512c84 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/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 31833a3..80d19e2 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -1874,6 +1874,9 @@ Public Class frmValidator If File.Exists(oResult) = False Then If USER_USERNAME = "SchreiberM" Then oResult = "\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\AANG-3302-swbn.pdf" + ElseIf USER_USERNAME = "Administrator" Then + 'oResult = "C:\Users\Administrator.DD-GAN\Desktop\test.pdf" + oResult = "\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\AANG-3302-swbn.pdf" Else LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...") oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({CURRENT_DOC_GUID},1)" @@ -4327,11 +4330,19 @@ Public Class frmValidator Exit For End If Else - Dim oDT As DataTable = IDBData.GetVariableValue(oIndexName, oIDBTyp) - If oDT.Rows.Count > 0 Then - LOGGER.Debug("User cleared the grid, so data needs to be erased!") + Dim oOldAttributeResult = IDBData.GetVariableValue(oIndexName, oIDBTyp) + Dim oTypeOldResult = oOldAttributeResult.GetType.ToString + If oTypeOldResult = "System.Data.DataTable" Then + Dim oDT As DataTable = IDBData.GetVariableValue(oIndexName, oIDBTyp) + If oDT.Rows.Count > 0 Then + LOGGER.Debug("User cleared the grid, so data needs to be erased!") + IDBData.Delete_AttributeData(CURRENT_DOC_ID, oIndexName) + End If + Else + LOGGER.Debug("(String) User cleared the grid, so data needs to be erased!") IDBData.Delete_AttributeData(CURRENT_DOC_ID, oIndexName) End If + End If End If