AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MS Funktionsprüfungen, benennung Parameter, neue GDPictureVersion

Browse Source
This commit is contained in:
Developer01
2025-05-19 15:07:42 +02:00
parent e8f3b68041
commit c2f02bf262
64 changed files with 225 additions and 392589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/DD-Record-Organizer/Classes/ClassDOC_SEARCH.vb
View File

@@ -569,12 +569,12 @@ Public Class ClassDOC_SEARCH
Return "R"
End If
Dim sql = String.Format("SELECT dwAccessRight FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwObjectID = {0} and dwUserOrGroupID = {1}", DOC_ID, USERID_FK_INT_ECM)
Dim result = MYDB_ECM.GetScalarValue(sql)
If IsNothing(result) Or IsDBNull(result) Then
Dim odwAccessRight = MYDB_ECM.GetScalarValue(sql)
If IsNothing(odwAccessRight) Or IsDBNull(odwAccessRight) Then
Return Nothing
End If
LOGGER.Debug($"dwAccesRight for DocID [{DOC_ID}] is [{result}]")
Select Case result
LOGGER.Debug($"dwAccesRight for DocID [{DOC_ID}] is [{odwAccessRight}]")
Select Case odwAccessRight
Case 1
If USER_IS_ADMIN = False Then
Return "R"
@@ -592,8 +592,16 @@ Public Class ClassDOC_SEARCH
Case 263
Return "RWA"
Case WM_RWA
LOGGER.Debug($"odwAccessRight is equal WM_RWA [{WM_RWA}]")
Return "RWA"
Case WM_RWA1
LOGGER.Debug($"odwAccessRight is equal WM_RWA1 [{WM_RWA1}]")
Return "RWA"
Case WM_RWA2
LOGGER.Debug($"odwAccessRight is equal WM_RWA2 [{WM_RWA2}]")
Return "RWA"
Case Else
Return "R"
End Select

14
app/DD-Record-Organizer/Classes/ClassImport_Windream.vb
View File

@@ -147,7 +147,7 @@ Public Class ClassImport_Windream
If oDYNAMIC_FOLDER <> String.Empty Then
If CREATE_FOLDER_INDEX(oDYNAMIC_FOLDER, DocTypeID) = True And CURRENT_VARIABLE_FOLDER <> "" Then
myLogger.Debug("After CREATE_FOLDER_INDEX - oWMTARGET_FOLDER: " & oWMTARGET_FOLDER)
'myLogger.Debug("After CREATE_FOLDER_INDEX - oWMTARGET_FOLDER: " & oWMTARGET_FOLDER)
myLogger.Debug("After CREATE_FOLDER_INDEX - CURRENT_VARIABLE_FOLDER: " & CURRENT_VARIABLE_FOLDER)
If oWMTARGET_FOLDER <> CURRENT_VARIABLE_FOLDER Then
@@ -159,12 +159,11 @@ Public Class ClassImport_Windream
oWMTARGET_FOLDER = CURRENT_VARIABLE_FOLDER
End If
'End If
Else
MsgBox("Unexpected Error in Creating Variable Folder - Check logfile!", MsgBoxStyle.Critical)
Return False
End If
Else
MsgBox("Unexpected Error in Creating Variable Folder - Check logfile!", MsgBoxStyle.Critical)
Return False
End If
End If
@@ -183,9 +182,8 @@ Public Class ClassImport_Windream
Try
oWMTARGET_FOLDER = WMMOD.GetNormalizedPath(oWMTARGET_FOLDER, 0)
If WMMOD.TestFolderExists(oWMTARGET_FOLDER) = False Then
oWMTARGET_FOLDER = oWMTARGET_FOLDER.Replace("W:", "\\windream\objects")
oWMTARGET_FOLDER = WMMOD.GetNormalizedPath(oWMTARGET_FOLDER, 0)
myLogger.Info(String.Format("Targetpath ({0}) is not existing or result of WD_PATH_EXISTS was false.", oWMTARGET_FOLDER.Substring(2)))
If WMMOD.NewFolder(oWMTARGET_FOLDER) = False Then