MS

app/DD-Record-Organizer/Classes/ClassFileResult.vb

@@ -6,7 +6,7 @@
             Dim upd As String
             InWork = False
             If comment = "" Then
-                upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Change_DateTime = GETDATE(), IN_WORK = {0} WHERE DocID = {1}", state, DocID)
+                upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Change_DateTime = GETDATE(), IN_WORK_USER = NULL, IN_WORK = {0} WHERE DocID = {1}", state, DocID)
             Else
                 upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Change_DateTime = GETDATE(), IN_WORK = {0}, IN_WORK_USER = '{1}', IN_WORK_COMMENT = '{2}' WHERE DocID = {3}", state, USER_USERNAME, comment, DocID)
             End If

app/DD-Record-Organizer/Classes/ClassInit.vb

@@ -1,6 +1,7 @@
 Imports System.ComponentModel
 Imports System.IO
 Imports DD_LIB_Standards
+Imports DevExpress.DataAccess.Native
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Logging
 
@@ -49,11 +50,12 @@ Public Class ClassInit
                     LOGGER.Debug("Connection String loaded")
                     MyConnectionString = DecryptConnectionString(CONFIG.Config.ConnectionString)
                 End If
-
-
             Catch ex As Exception
                 LOGGER.Error(ex, "Unexpected Error Getting CONFIG.TestMode or CONFIG.ConnectionStringTest")
             End Try
+
+
+
         Catch ex As Exception
 
         End Try
@@ -413,6 +415,8 @@ WHERE (USERNAME = '{0}') AND T2.SHORT_NAME = 'ADDI'", USER_USERNAME)
                     If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then
                         SQL_FULLTEXT = "SELECT DISTINCT [dwDocID] FROM [dbo].FullText WHERE CONTAINS([Text], '""*@FULLTEXT*""') "
                     End If
+                    Dim oSQL = $"SELECT COUNT(GU.GUID) FROM	TBDD_GROUPS_USER GU INNER JOIN TBDD_GROUPS G ON GU.GROUP_ID = G.GUID WHERE G.NAME = 'ORGFLOW-Supervisor' AND GU.USER_ID = {USER_GUID}"
+                    USER_IS_SUPERVISOR = ClassDatabase.Execute_Scalar(oSQL, False)
                     Return True
                     'LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & anzahl.ToString
                 End If

app/DD-Record-Organizer/Classes/Controls/ClassControlCommandsUI.vb

@@ -343,7 +343,7 @@ Public Class ClassControlCommandsUI
     End Function
 
 
-    Function SaveRecord(RecordID As Integer, FormID As Integer, Optional foreignRecordID As Integer = 0) As String
+    Function SaveRecord(RecordID As Integer, FormID As Integer) As String
         Try
             Dim ADDED_WHO As String = USER_USERNAME
             LOGGER.Debug("(SaveRecord) Update RecordID: " & RecordID, False)