MS

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

@@ -89,42 +89,59 @@ Public Class ClassDOC_SEARCH
                 End If
 
             ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then
-                SQL_DOC_SEARCH = $"SELECT T.* ," & vbNewLine &
+                SQL_DOC_SEARCH = SQL_DOC_RESULT_RECORD
-               $"ISNULL(T1.VALUE,'') AS OPTION1," & vbNewLine &
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString
-               $"ISNULL(T2.VALUE,'') AS OPTION2," & vbNewLine &
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@ENTITY_ID", ENTITY_ID)
-               $"ISNULL(T3.VALUE,'') AS OPTION3," & vbNewLine &
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@USER_LANGUAGE", USER_LANGUAGE)
-               $"ISNULL(T4.VALUE,'') AS OPTION4," & vbNewLine &
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@VALUE_CONF1", VALUE_CONF1)
-               $"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX1') AS DOCIDX1," & vbNewLine &
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@VALUE_CONF2", VALUE_CONF2)
-               $"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX2') AS DOCIDX2," & vbNewLine &
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@VALUE_CONF3", VALUE_CONF3)
-               $"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX3') AS DOCIDX3," & vbNewLine &
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@VALUE_CONF4", VALUE_CONF4)
-               $"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX4') AS DOCIDX4," & vbNewLine &
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@VALUE_CONF5", VALUE_CONF5)
-               $"[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN1','{7}',TRL.RECORD_ID) AS DROPDOWN1," & vbNewLine &
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@VALUE_CONF6", VALUE_CONF6)
-               $"[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN2','{7}',TRL.RECORD_ID) AS DROPDOWN2," & vbNewLine &
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@OPTION1", OPTION1)
-               $"[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN3','{7}',TRL.RECORD_ID) AS DROPDOWN3," & vbNewLine &
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@OPTION2", OPTION2)
-               $"[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN4','{7}',TRL.RECORD_ID) AS DROPDOWN4," & vbNewLine &
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@OPTION3", OPTION3)
-               $"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC.GUID),'') AS VALUE1," & vbNewLine &
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@OPTION4", OPTION4)
-               $"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC1.GUID),'') AS VALUE2," & vbNewLine &
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@RECORD_ID", RECORD_ID)
-               $"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC2.GUID),'') AS VALUE3," & vbNewLine &
+                SQL_DOC_SEARCH = SQL_DOC_SEARCH.ToString.Replace("@USERID_FK_INT_ECM", USERID_FK_INT_ECM)
-               $"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC3.GUID),'') AS VALUE4," & vbNewLine &
+
-              $"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC4.GUID),'') AS VALUE5," & vbNewLine &
+                '  SQL_DOC_SEARCH = $"SELECT T.* ," & vbNewLine &
-              $"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC5.GUID),'') AS VALUE6," & vbNewLine &
+                ' $"ISNULL(T1.VALUE,'') AS OPTION1," & vbNewLine &
-              $"dwAccessRight AS ACCESS_RIGHT" & vbNewLine &
+                ' $"ISNULL(T2.VALUE,'') AS OPTION2," & vbNewLine &
-              $"FROM " & vbNewLine &
+                ' $"ISNULL(T3.VALUE,'') AS OPTION3," & vbNewLine &
-              $"VWPMO_DOC_SEARCH T " & vbNewLine &
+                ' $"ISNULL(T4.VALUE,'') AS OPTION4," & vbNewLine &
-              $"INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine &
+                ' $"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX1') AS DOCIDX1," & vbNewLine &
-              $"INNER JOIN TBPMO_RECORD TR	ON TRL.RECORD_ID = TR.GUID" & vbNewLine &
+                ' $"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX2') AS DOCIDX2," & vbNewLine &
-               $"INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHTS ON T.DocID = TRIGHTS.dwObjectID" & vbNewLine &
+                ' $"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX3') AS DOCIDX3," & vbNewLine &
-               $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC ON TR.FORM_ID  = TRC.ENTITY_ID AND TRC.LANGUAGE = '{USER_LANGUAGE}' AND TRC.GUID = {VALUE_CONF1}" & vbNewLine &
+                ' $"[dbo].[FNPMO_DOC_GET_IDX] (T.DocID,{1},'DOCIDX4') AS DOCIDX4," & vbNewLine &
-                $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC1 ON TR.FORM_ID  = TRC1.ENTITY_ID AND TRC1.LANGUAGE = '{USER_LANGUAGE}' AND TRC1.GUID = {VALUE_CONF2}" & vbNewLine &
+                ' $"[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN1','{7}',TRL.RECORD_ID) AS DROPDOWN1," & vbNewLine &
-                $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC2 ON TR.FORM_ID  = TRC2.ENTITY_ID AND TRC2.LANGUAGE = '{USER_LANGUAGE}' AND TRC2.GUID = {VALUE_CONF3}" & vbNewLine &
+                ' $"[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN2','{7}',TRL.RECORD_ID) AS DROPDOWN2," & vbNewLine &
-                $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC3 ON TR.FORM_ID  = TRC3.ENTITY_ID AND TRC3.LANGUAGE = '{USER_LANGUAGE}' AND TRC3.GUID = {VALUE_CONF4}" & vbNewLine &
+                ' $"[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN3','{7}',TRL.RECORD_ID) AS DROPDOWN3," & vbNewLine &
-                $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC4 ON TR.FORM_ID  = TRC4.ENTITY_ID AND TRC4.LANGUAGE = '{USER_LANGUAGE}' AND TRC4.GUID = {VALUE_CONF5}" & vbNewLine &
+                ' $"[dbo].[FNPMO_DOC_GET_DROPDOWN_VALUE] (T.DocID,{1},'DROPDOWN4','{7}',TRL.RECORD_ID) AS DROPDOWN4," & vbNewLine &
-                $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC5 ON TR.FORM_ID  = TRC5.ENTITY_ID AND TRC5.LANGUAGE = '{USER_LANGUAGE}' AND TRC5.GUID = {VALUE_CONF6}" & vbNewLine &
+                ' $"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC.GUID),'') AS VALUE1," & vbNewLine &
-               $"LEFT JOIN TBPMO_CONTROL_VALUE T1 ON TRL.RECORD_ID = T1.RECORD_ID AND T1.CONTROL_ID = {OPTION1} " & vbNewLine &
+                ' $"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC1.GUID),'') AS VALUE2," & vbNewLine &
-               $"LEFT JOIN TBPMO_CONTROL_VALUE T2 ON TRL.RECORD_ID = T2.RECORD_ID AND T2.CONTROL_ID = {OPTION2} " & vbNewLine &
+                ' $"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC2.GUID),'') AS VALUE3," & vbNewLine &
-               $"LEFT JOIN TBPMO_CONTROL_VALUE T3 ON TRL.RECORD_ID = T3.RECORD_ID AND T3.CONTROL_ID = {OPTION3} " & vbNewLine &
+                ' $"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC3.GUID),'') AS VALUE4," & vbNewLine &
-               $"LEFT JOIN TBPMO_CONTROL_VALUE T4 ON TRL.RECORD_ID = T4.RECORD_ID AND T4.CONTROL_ID = {OPTION4} " & vbNewLine &
+                '$"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC4.GUID),'') AS VALUE5," & vbNewLine &
-               $"WHERE TRL.RECORD_ID = {RECORD_ID} AND TR.FORM_ID  = {ENTITY_ID} AND TRIGHTS.dwUserOrGroupID = {USERID_FK_INT_ECM}"
+                '$"COALESCE([dbo].[FNPMO_DOC_GET_DOC_VALUE] (T.DocID,TRL.RECORD_ID,TRC5.GUID),'') AS VALUE6," & vbNewLine &
+                '$"dwAccessRight AS ACCESS_RIGHT" & vbNewLine &
+                '$"FROM " & vbNewLine &
+                '$"VWPMO_DOC_SEARCH T " & vbNewLine &
+                '$"INNER JOIN TBPMO_DOC_RECORD_LINK TRL ON T.DocID = TRL.DOC_ID" & vbNewLine &
+                '$"INNER JOIN TBPMO_RECORD TR	ON TRL.RECORD_ID = TR.GUID" & vbNewLine &
+                ' $"INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHTS ON T.DocID = TRIGHTS.dwObjectID" & vbNewLine &
+                ' $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC ON TR.FORM_ID  = TRC.ENTITY_ID AND TRC.LANGUAGE = '{USER_LANGUAGE}' AND TRC.GUID = {VALUE_CONF1}" & vbNewLine &
+                '  $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC1 ON TR.FORM_ID  = TRC1.ENTITY_ID AND TRC1.LANGUAGE = '{USER_LANGUAGE}' AND TRC1.GUID = {VALUE_CONF2}" & vbNewLine &
+                '  $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC2 ON TR.FORM_ID  = TRC2.ENTITY_ID AND TRC2.LANGUAGE = '{USER_LANGUAGE}' AND TRC2.GUID = {VALUE_CONF3}" & vbNewLine &
+                '  $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC3 ON TR.FORM_ID  = TRC3.ENTITY_ID AND TRC3.LANGUAGE = '{USER_LANGUAGE}' AND TRC3.GUID = {VALUE_CONF4}" & vbNewLine &
+                '  $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC4 ON TR.FORM_ID  = TRC4.ENTITY_ID AND TRC4.LANGUAGE = '{USER_LANGUAGE}' AND TRC4.GUID = {VALUE_CONF5}" & vbNewLine &
+                '  $"LEFT JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG TRC5 ON TR.FORM_ID  = TRC5.ENTITY_ID AND TRC5.LANGUAGE = '{USER_LANGUAGE}' AND TRC5.GUID = {VALUE_CONF6}" & vbNewLine &
+                ' $"LEFT JOIN TBPMO_CONTROL_VALUE T1 ON TRL.RECORD_ID = T1.RECORD_ID AND T1.CONTROL_ID = {OPTION1} " & vbNewLine &
+                ' $"LEFT JOIN TBPMO_CONTROL_VALUE T2 ON TRL.RECORD_ID = T2.RECORD_ID AND T2.CONTROL_ID = {OPTION2} " & vbNewLine &
+                ' $"LEFT JOIN TBPMO_CONTROL_VALUE T3 ON TRL.RECORD_ID = T3.RECORD_ID AND T3.CONTROL_ID = {OPTION3} " & vbNewLine &
+                ' $"LEFT JOIN TBPMO_CONTROL_VALUE T4 ON TRL.RECORD_ID = T4.RECORD_ID AND T4.CONTROL_ID = {OPTION4} " & vbNewLine &
+                ' $"WHERE TRL.RECORD_ID = {RECORD_ID} AND TR.FORM_ID  = {ENTITY_ID} AND TRIGHTS.dwUserOrGroupID = {USERID_FK_INT_ECM}"
             ElseIf CURRENT_SEARCH_TYPE = "FULLTEXT" Then
                 Dim sqlft = SQL_FULLTEXT
                 sqlft = sqlft.Replace("@FULLTEXT", CURRENT_FULLTEXT_PATTERN)
@@ -461,6 +478,12 @@ Public Class ClassDOC_SEARCH
 
 
                             oNewRow.Item(i) = CBool(rowvalue)
+                        ElseIf oType = "System.Int32" Then
+                            If Len(rowvalue) = 0 Then
+                                oNewRow.Item(i) = 0
+                            Else
+                                oNewRow.Item(i) = CInt(rowvalue)
+                            End If
                         Else
                                 oNewRow.Item(i) = rowvalue.ToString
                         End If
@@ -516,7 +539,7 @@ Public Class ClassDOC_SEARCH
             Return False
         End Try
     End Function
-    Public Shared Function SET_WD_RIGHTS(ByVal RESULT_DOCID, ByVal RESULT_DOC_PATH)
+    Public Shared Function SET_WD_RIGHTS(RESULT_DOCID As Integer, RESULT_DOC_PATH As String, DeleteRightsBefore As Boolean)
         Try
             If CURRENT_RECORD_ID = 0 Then
                 MsgBox("No Record selected - Please select one!", MsgBoxStyle.Exclamation)
@@ -524,7 +547,7 @@ Public Class ClassDOC_SEARCH
             End If
             LOGGER.Debug("#### SETTING RIGHTS FOR FILE ######", False)
             If ClassWDRights.Init = True Then
-                If ClassWDRights.Doc_Renew_Rights(RESULT_DOCID, RESULT_DOC_PATH, True) Then
+                If ClassWDRights.Doc_Renew_Rights(RESULT_DOCID, RESULT_DOC_PATH, DeleteRightsBefore) Then
                     If ClassWDRights.MSG_RESULT <> "" Then
                         Dim msg = "Achtung: einige Rechte konnten nicht gesetzt werden: " & vbNewLine & ClassWDRights.MSG_RESULT
                         If USER_LANGUAGE <> "de-DE" Then

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

@@ -135,6 +135,13 @@ Public Class ClassInit
                 SQL_FULLTEXT = KONFIG_DT.Rows(0).Item("SQL_FULLTEXT")
             End If
 
+            sql = "SELECT * FROM TBDD_SQL_COMMANDS"
+            Dim oDTSQL_COMMANDS As DataTable = ClassDatabase.Return_Datatable(sql, True)
+            For Each oRow As DataRow In oDTSQL_COMMANDS.Rows
+                If oRow.Item("TITLE") = "ADDI_DOC_SEARCH_RECORD" Then
+                    SQL_DOC_RESULT_RECORD = oRow.Item("SQL_COMMAND")
+                End If
+            Next
             sql = "SELECT * FROM TBPMO_CONTROL"
             CURRENT_TBPMO_CONTROL = ClassDatabase.Return_Datatable(sql, True)
             sql = String.Format("SELECT * FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1")
@@ -281,10 +288,11 @@ WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAM
                     sql = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Record-Organizer') AND CLIENT_ID = {0}", CLIENT_SELECTED)
                     Dim anzahl = ClassDatabase.Execute_Scalar(sql, False)
                     USERS_LOGGED_IN = CInt(anzahl)
-                    LOGGER.Debug("User# logged in: " & anzahl.ToString)
+                    LOGGER.Info("User# logged in: " & anzahl.ToString)
+                    LOGGER.Info("LICENSE_COUNT: " & LICENSE_COUNT.ToString)
                     '####
 
-                    If LICENSE_COUNT < USERS_LOGGED_IN And LICENSE_EXPIRED = False Then
+                    If LICENSE_COUNT <= (USERS_LOGGED_IN + 1) And LICENSE_EXPIRED = False Then
                         Dim msg = String.Format("Die Anzahl der aktuell angemeldeten User (" & USERS_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
 
                         If USER_LANGUAGE <> "de-DE" Then

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

@@ -186,9 +186,9 @@ Public Class ClassWindreamDocGrid
             Dim type As Integer = row.Item("TYPE_ID")
 
 
-            If type = 4 And isConfig = False Then
+            If type = 3 And isConfig = False Then
                 DATE_COLUMNS.Add(columnTitle)
-            ElseIf type = 4 And isConfig = True Then
+            ElseIf type = 3 And isConfig = True Then
                 DATE_COLUMNS_CONFIG.Add(columnTitle)
             End If
 
@@ -311,7 +311,7 @@ Public Class ClassWindreamDocGrid
             Dim type As Integer = row.Item("TYPE_ID")
             Dim isConfig As Boolean = row.Item("CONFIG_COLUMNS")
 
-            If Not IsNothing(col) And type = 4 And isConfig Then
+            If Not IsNothing(col) And type = 3 And isConfig Then
                 LOGGER.Debug($"Adapting DisplayFormat (DATETIME for Column {colCaption}")
                 col.DisplayFormat.FormatType = FormatType.DateTime
                 col.DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss"
@@ -373,9 +373,7 @@ Public Class ClassWindreamDocGrid
                     AddHandler textedit.Leave, _textValueChangedHandler
 
                     e.RepositoryItem = textedit
-                End If
+                ElseIf typeId = 2 Then
-
-                If typeId = 2 Then
                     Dim checkEdit As New RepositoryItemCheckEdit()
                     checkEdit.ValueChecked = "True"
                     checkEdit.ValueUnchecked = "False"
@@ -385,9 +383,7 @@ Public Class ClassWindreamDocGrid
                     AddHandler checkEdit.CheckedChanged, _checkValueChangedHandler
 
                     e.RepositoryItem = checkEdit
-                End If
+                ElseIf typeId = 3 Then
-
-                If typeId = 3 Then
                     Dim dateedit As New RepositoryItemDateEdit()
 
                     dateedit.DisplayFormat.FormatType = FormatType.DateTime
@@ -415,22 +411,28 @@ Public Class ClassWindreamDocGrid
 
                     AddHandler dateedit.EditValueChanged, _datepickerValueChangedHandler
                     e.RepositoryItem = dateedit
-                End If
+                    'ElseIf typeId = 4 And editable = F Then
+                    '    Dim dropdown As New RepositoryItemComboBox()
+                    '    Dim matchingRows() As DataRow = DT_DROPDOWN_ITEMS.Select(String.Format("CONFIG_ID = {0}", configId), "SEQUENCE")
 
-                If typeId = 4 Then
+                    '    For Each matchingRow As DataRow In matchingRows
-                    Dim dropdown As New RepositoryItemComboBox()
+                    '        Dim item As New WindreamDocGridComboboxItem()
-                    Dim matchingRows() As DataRow = DT_DROPDOWN_ITEMS.Select(String.Format("CONFIG_ID = {0}", configId), "SEQUENCE")
+                    '        item.ConfigID = matchingRow.Item("CONFIG_ID")
+                    '        item.Value = matchingRow.Item("VALUE")
+                    '        dropdown.Items.Add(item)
+                    '    Next
 
-                    For Each matchingRow As DataRow In matchingRows
+                    '    AddHandler dropdown.SelectedValueChanged, _dropdownValueChangedHandler
-                        Dim item As New WindreamDocGridComboboxItem()
-                        item.ConfigID = matchingRow.Item("CONFIG_ID")
-                        item.Value = matchingRow.Item("VALUE")
-                        dropdown.Items.Add(item)
-                    Next
 
-                    AddHandler dropdown.SelectedValueChanged, _dropdownValueChangedHandler
+                    '    e.RepositoryItem = dropdown
 
-                    e.RepositoryItem = dropdown
+                    'End If
+                ElseIf typeId = 4 And editable Then
+                    Dim textedit As New RepositoryItemTextEdit()
+
+                    AddHandler textedit.Leave, _textValueChangedHandler
+
+                    e.RepositoryItem = textedit
 
                 End If
             ElseIf (e.Column.Name <> "colVALUE") Then

app/DD-Record-Organizer/ModuleRuntimeVariables.vb

@@ -187,4 +187,6 @@
     Public CURRENT_DOCSEARCH_SQL As String
     Public CURRENT_DOCSEARCH_CAPTION As String
     Public CURRENT_FILE_RIGHT As String
+
+    Public SQL_DOC_RESULT_RECORD As String = ""
 End Module

app/DD-Record-Organizer/My Project/AssemblyInfo.vb

@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.7.5.1")>
+<Assembly: AssemblyVersion("2.7.6.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 

app/DD-Record-Organizer/frmConstructor_Main.vb

@@ -2556,7 +2556,7 @@ Public Class frmConstructor_Main
 
             expression = String.Format("ENTITY_ID = {0} AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE)
             DT_WINDREAM_COLUMNS_GRID = ClassHelper.FILTER_DATATABLE(CURRENT_RESULTLIST_CONFIG, expression, "SEQUENCE")
-            expression = String.Format("ENTITY_ID = {0} AND TYPE_ID = 3 AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE)
+            expression = String.Format("ENTITY_ID = {0} AND TYPE_ID = 10 AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE)
             DT_DOCRESULT_DROPDOWN_ITEMS = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS, expression, "SEQUENCE")
 
             DT_RESULTLIST_OPTIONS = ClassHelper.FILTER_DATATABLE(CURRENT_VARIABLE_CONTROLS, "ENTITY_ID = " & ENTITY_ID, "")
@@ -3301,7 +3301,7 @@ Public Class frmConstructor_Main
                 End If
                 bStaticItem1.Caption = msg & Get_Grid_Row_Count()
             End If
-            RibbonPageGroupSuchen.Enabled = True
+            RibbonPageGroupSuchen.Visible = True
         Catch ex As Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in LoadGrid_Records", ex.Message, ex.StackTrace)
             Return False
@@ -6145,7 +6145,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
         Dim err As Boolean = False
         Cursor = Cursors.WaitCursor
         For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
-            If ClassDOC_SEARCH.SET_WD_RIGHTS(row.Item("DOC_ID"), row.Item("DOC_PATH")) = True Then
+            If ClassDOC_SEARCH.SET_WD_RIGHTS(row.Item("DOC_ID"), row.Item("DOC_PATH"), True) = True Then
 
             Else
                 err = True
@@ -6994,10 +6994,10 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             Me.Cursor = Cursors.WaitCursor
             Dim Record_Changes As String = "SELECT count(GUID) FROM VWPMO_RECORD_CHANGES WHERE RECORD_ID = " & RECORD_ID
             Dim RC = ClassDatabase.Execute_Scalar(Record_Changes, True)
-            bbtniReclog.Enabled = False
+            bbtniReclog.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
             If Not RC Is Nothing Then
                 If RC > 0 Then
-                    bbtniReclog.Enabled = True
+                    bbtniReclog.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
                 End If
             End If
             If RIGHT_RECORD_AND_FILE_READ_ONLY = True Or NODE_NAVIGATION = True Then

app/DD-Record-Organizer/frmMain.vb

@@ -217,6 +217,7 @@ Public Class frmMain
             Dim oSQL = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Record-Organizer') AND CLIENT_ID = {0}", CLIENT_SELECTED)
             Dim anzahl = ClassDatabase.Execute_Scalar(oSQL, False)
             USERS_LOGGED_IN = CInt(anzahl)
+
         Catch ex As Exception
 
         End Try
@@ -225,6 +226,7 @@ Public Class frmMain
             msg = "#User logged in: " & USERS_LOGGED_IN.ToString()
         End If
         LabelLoggedIn.Caption = msg
+        LOGGER.Info(msg + "(+1)")
     End Sub
     Sub Display_ConString()
         Try
@@ -572,7 +574,7 @@ Public Class frmMain
                 End If
 
                 'Lizenz abgellaufen, überprüfen ob User Admin ist
-                If LICENSE_COUNT < USERS_LOGGED_IN Then
+                If LICENSE_COUNT <= (USERS_LOGGED_IN + 1) Then
                     If USER_IS_ADMIN = True Then
                         LOGGER.Info("User is Admin - Timer will be started", False)
                         'If USER_LANGUAGE = "de-DE" Then
@@ -836,7 +838,7 @@ Public Class frmMain
     End Sub
 
     Private Sub TimerClose3Minutes_Tick(sender As Object, e As EventArgs) Handles TimerClose3Minutes.Tick
-        If LICENSE_EXPIRED = True Or LICENSE_COUNT < USERS_LOGGED_IN Then
+        If LICENSE_EXPIRED = True Or LICENSE_COUNT <= (USERS_LOGGED_IN + 1) Then
             'If USER_LANGUAGE = "de-DE" Then
             '    MsgBox("Global Indexer wird nun geschlossen, weil keine neue Lizenzdaten eingegeben wurden!", MsgBoxStyle.Information)
             'Else

app/DD-Record-Organizer/frmRecordView.Designer.vb

@@ -243,7 +243,7 @@ Partial Class frmRecordView
         '
         'TCDetails
         '
-        Me.TCDetails.AppearancePage.HeaderHotTracked.BackColor = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.BackColor"), System.Drawing.Color)
+        Me.TCDetails.AppearancePage.HeaderHotTracked.BackColor = System.Drawing.Color.Fuchsia
         Me.TCDetails.AppearancePage.HeaderHotTracked.BackColor2 = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.BackColor2"), System.Drawing.Color)
         Me.TCDetails.AppearancePage.HeaderHotTracked.Font = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.Font"), System.Drawing.Font)
         Me.TCDetails.AppearancePage.HeaderHotTracked.Options.UseBackColor = True
@@ -256,7 +256,7 @@ Partial Class frmRecordView
         'TabDetails
         '
         Me.TabDetails.Controls.Add(Me.pnlDetails)
-        Me.TabDetails.Image = Global.DD_Record_Organizer.My.Resources.Resources.grid_Data_16xMD
+        Me.TabDetails.ImageOptions.Image = Global.DD_Record_Organizer.My.Resources.Resources.grid_Data_16xMD
         Me.TabDetails.Name = "TabDetails"
         resources.ApplyResources(Me.TabDetails, "TabDetails")
         '
@@ -271,7 +271,7 @@ Partial Class frmRecordView
         Me.TabFollowUp.Controls.Add(Me.ListViewFollowUps)
         Me.TabFollowUp.Controls.Add(Me.grpbxFU_Profile)
         Me.TabFollowUp.Controls.Add(Me.Label5)
-        Me.TabFollowUp.Image = Global.DD_Record_Organizer.My.Resources.Resources.Task_16xMD
+        Me.TabFollowUp.ImageOptions.Image = Global.DD_Record_Organizer.My.Resources.Resources.Task_16xMD
         Me.TabFollowUp.Name = "TabFollowUp"
         resources.ApplyResources(Me.TabFollowUp, "TabFollowUp")
         '
@@ -383,7 +383,7 @@ Partial Class frmRecordView
         '
         Me.TabPos.Controls.Add(Me.Panel1)
         Me.TabPos.Controls.Add(Me.BindingNavigatorPOS)
-        Me.TabPos.Image = CType(resources.GetObject("TabPos.Image"), System.Drawing.Image)
+        Me.TabPos.ImageOptions.Image = CType(resources.GetObject("TabPos.ImageOptions.Image"), System.Drawing.Image)
         Me.TabPos.Name = "TabPos"
         Me.TabPos.PageVisible = False
         resources.ApplyResources(Me.TabPos, "TabPos")
@@ -403,7 +403,7 @@ Partial Class frmRecordView
         '
         'grvwGridPos
         '
-        Me.grvwGridPos.Appearance.EvenRow.BackColor = CType(resources.GetObject("grvwGridPos.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.grvwGridPos.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
         Me.grvwGridPos.Appearance.EvenRow.Options.UseBackColor = True
         Me.grvwGridPos.GridControl = Me.GridControlPos
         Me.grvwGridPos.Name = "grvwGridPos"
@@ -488,7 +488,7 @@ Partial Class frmRecordView
         '
         'TabControlBottom
         '
-        Me.TabControlBottom.AppearancePage.HeaderHotTracked.BackColor = CType(resources.GetObject("TabControlBottom.AppearancePage.HeaderHotTracked.BackColor"), System.Drawing.Color)
+        Me.TabControlBottom.AppearancePage.HeaderHotTracked.BackColor = System.Drawing.Color.Fuchsia
         Me.TabControlBottom.AppearancePage.HeaderHotTracked.BackColor2 = CType(resources.GetObject("TabControlBottom.AppearancePage.HeaderHotTracked.BackColor2"), System.Drawing.Color)
         Me.TabControlBottom.AppearancePage.HeaderHotTracked.Font = CType(resources.GetObject("TabControlBottom.AppearancePage.HeaderHotTracked.Font"), System.Drawing.Font)
         Me.TabControlBottom.AppearancePage.HeaderHotTracked.Options.UseBackColor = True
@@ -503,7 +503,7 @@ Partial Class frmRecordView
         Me.TabPageDoc.AllowDrop = True
         Me.TabPageDoc.Controls.Add(Me.GridControlDocSearch)
         Me.TabPageDoc.Controls.Add(Me.ToolStrip2)
-        Me.TabPageDoc.Image = Global.DD_Record_Organizer.My.Resources.Resources.Files_7954
+        Me.TabPageDoc.ImageOptions.Image = Global.DD_Record_Organizer.My.Resources.Resources.Files_7954
         Me.TabPageDoc.Name = "TabPageDoc"
         resources.ApplyResources(Me.TabPageDoc, "TabPageDoc")
         '
@@ -637,9 +637,9 @@ Partial Class frmRecordView
         '
         'GridViewlUsers2Group
         '
-        Me.GridViewlUsers2Group.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewlUsers2Group.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.GridViewlUsers2Group.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
         Me.GridViewlUsers2Group.Appearance.EvenRow.Options.UseBackColor = True
-        Me.GridViewlUsers2Group.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewlUsers2Group.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
+        Me.GridViewlUsers2Group.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
         Me.GridViewlUsers2Group.Appearance.FocusedRow.Options.UseBackColor = True
         Me.GridViewlUsers2Group.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSelect, Me.GridColumn1, Me.GridColumn2, Me.colID})
         Me.GridViewlUsers2Group.GridControl = Me.GridControlUsersSelection
@@ -684,6 +684,7 @@ Partial Class frmRecordView
         resources.ApplyResources(Me.ListViewExclusiveUser, "ListViewExclusiveUser")
         Me.ListViewExclusiveUser.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader3, Me.ColumnHeader5})
         Me.ListViewExclusiveUser.FullRowSelect = True
+        Me.ListViewExclusiveUser.HideSelection = False
         Me.ListViewExclusiveUser.Name = "ListViewExclusiveUser"
         Me.ListViewExclusiveUser.UseCompatibleStateImageBehavior = False
         Me.ListViewExclusiveUser.View = System.Windows.Forms.View.Details
@@ -749,9 +750,9 @@ Partial Class frmRecordView
         '
         'GridView2
         '
-        Me.GridView2.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView2.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        Me.GridView2.Appearance.EvenRow.BackColor = System.Drawing.Color.LightBlue
         Me.GridView2.Appearance.EvenRow.Options.UseBackColor = True
-        Me.GridView2.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView2.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
+        Me.GridView2.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
         Me.GridView2.Appearance.FocusedRow.Options.UseBackColor = True
         Me.GridView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colSTATE_DESC, Me.colCOMMENT, Me.colADDED_WHO, Me.colADDED_WHEN})
         Me.GridView2.GridControl = Me.GridControl1

app/DD-Record-Organizer/frmRecordView.resx

@@ -468,9 +468,6 @@
   <data name="SplitContainerMain.Orientation" type="System.Windows.Forms.Orientation, System.Windows.Forms">
     <value>Horizontal</value>
   </data>
-  <data name="TCDetails.AppearancePage.HeaderHotTracked.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Fuchsia</value>
-  </data>
   <data name="TCDetails.AppearancePage.HeaderHotTracked.BackColor2" type="System.Drawing.Color, System.Drawing">
     <value>255, 192, 255</value>
   </data>
@@ -493,7 +490,7 @@
     <value>0, 0</value>
   </data>
   <data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1332, 301</value>
+    <value>1336, 304</value>
   </data>
   <data name="pnlDetails.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -511,7 +508,7 @@
     <value>0</value>
   </data>
   <data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1332, 301</value>
+    <value>1336, 304</value>
   </data>
   <data name="TabDetails.Text" xml:space="preserve">
     <value>Detailansicht</value>
@@ -553,7 +550,7 @@
     <value>14, 35</value>
   </data>
   <data name="ListViewFollowUps.Size" type="System.Drawing.Size, System.Drawing">
-    <value>263, 126</value>
+    <value>263, 129</value>
   </data>
   <data name="ListViewFollowUps.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -783,7 +780,7 @@
     <value>177, 20</value>
   </data>
   <data name="GroupBox4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>594, 108</value>
+    <value>594, 111</value>
   </data>
   <data name="GroupBox4.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -924,7 +921,7 @@
     <value>283, 27</value>
   </data>
   <data name="grpbxFU_Profile.Size" type="System.Drawing.Size, System.Drawing">
-    <value>774, 134</value>
+    <value>774, 137</value>
   </data>
   <data name="grpbxFU_Profile.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -972,7 +969,7 @@
     <value>2</value>
   </data>
   <data name="TabFollowUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1332, 301</value>
+    <value>1336, 304</value>
   </data>
   <data name="TabFollowUp.Text" xml:space="preserve">
     <value>Wiedervorlage</value>
@@ -995,11 +992,8 @@
   <data name="GridControlPos.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="grvwGridPos.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>LightBlue</value>
-  </data>
   <data name="GridControlPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1332, 276</value>
+    <value>1336, 279</value>
   </data>
   <data name="GridControlPos.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -1023,7 +1017,7 @@
     <value>0, 25</value>
   </data>
   <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1332, 276</value>
+    <value>1336, 279</value>
   </data>
   <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -1141,6 +1135,9 @@
   <data name="BindingNavigatorPositionItem.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
+  <data name="BindingNavigatorPositionItem.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt</value>
+  </data>
   <data name="BindingNavigatorPositionItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>50, 23</value>
   </data>
@@ -1198,7 +1195,7 @@
     <value>0, 0</value>
   </data>
   <data name="BindingNavigatorPOS.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1332, 25</value>
+    <value>1336, 25</value>
   </data>
   <data name="BindingNavigatorPOS.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -1218,7 +1215,7 @@
   <data name="&gt;&gt;BindingNavigatorPOS.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="TabPos.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="TabPos.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAExpc3Q7QnVsbGV0O1FzfzkAAABa
@@ -1227,7 +1224,7 @@
 </value>
   </data>
   <data name="TabPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1332, 301</value>
+    <value>1336, 304</value>
   </data>
   <data name="TabPos.Text" xml:space="preserve">
     <value>Positionen</value>
@@ -1268,9 +1265,6 @@
   <data name="&gt;&gt;SplitContainerMain.Panel1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="TabControlBottom.AppearancePage.HeaderHotTracked.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Fuchsia</value>
-  </data>
   <data name="TabControlBottom.AppearancePage.HeaderHotTracked.BackColor2" type="System.Drawing.Color, System.Drawing">
     <value>255, 192, 255</value>
   </data>
@@ -1314,7 +1308,7 @@
     <value>0, 25</value>
   </data>
   <data name="GridControlDocSearch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1332, 302</value>
+    <value>1336, 305</value>
   </data>
   <data name="GridControlDocSearch.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -1347,7 +1341,7 @@
     <value>0, 0</value>
   </data>
   <data name="ToolStrip2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1332, 25</value>
+    <value>1336, 25</value>
   </data>
   <data name="ToolStrip2.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -1368,7 +1362,7 @@
     <value>1</value>
   </data>
   <data name="TabPageDoc.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1332, 327</value>
+    <value>1336, 330</value>
   </data>
   <data name="TabPageDoc.Text" xml:space="preserve">
     <value>Dateien</value>
@@ -1439,12 +1433,6 @@
   <data name="GridControlUsersSelection.Location" type="System.Drawing.Point, System.Drawing">
     <value>314, 24</value>
   </data>
-  <data name="GridViewlUsers2Group.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>LightBlue</value>
-  </data>
-  <data name="GridViewlUsers2Group.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Fuchsia</value>
-  </data>
   <data name="colSelect.Caption" xml:space="preserve">
     <value>Selection</value>
   </data>
@@ -1476,7 +1464,7 @@
     <value>102</value>
   </data>
   <data name="GridControlUsersSelection.Size" type="System.Drawing.Size, System.Drawing">
-    <value>284, 223</value>
+    <value>284, 226</value>
   </data>
   <data name="GridControlUsersSelection.TabIndex" type="System.Int32, mscorlib">
     <value>88</value>
@@ -1512,7 +1500,7 @@
     <value>16, 24</value>
   </data>
   <data name="ListViewExclusiveUser.Size" type="System.Drawing.Size, System.Drawing">
-    <value>174, 223</value>
+    <value>174, 226</value>
   </data>
   <data name="ListViewExclusiveUser.TabIndex" type="System.Int32, mscorlib">
     <value>27</value>
@@ -1663,7 +1651,7 @@ zuordnen</value>
     <value>5</value>
   </data>
   <data name="XtraTabPage3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>620, 267</value>
+    <value>624, 270</value>
   </data>
   <data name="XtraTabPage3.Text" xml:space="preserve">
     <value>User zuordnen</value>
@@ -1698,12 +1686,6 @@ zuordnen</value>
   <data name="GridControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>3, 6</value>
   </data>
-  <data name="GridView2.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>LightBlue</value>
-  </data>
-  <data name="GridView2.Appearance.FocusedRow.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Fuchsia</value>
-  </data>
   <data name="colGUID.Caption" xml:space="preserve">
     <value>ID</value>
   </data>
@@ -1759,7 +1741,7 @@ zuordnen</value>
     <value>4</value>
   </data>
   <data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>595, 258</value>
+    <value>595, 261</value>
   </data>
   <data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
     <value>89</value>
@@ -1777,7 +1759,7 @@ zuordnen</value>
     <value>0</value>
   </data>
   <data name="XtraTabPage4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>620, 267</value>
+    <value>624, 270</value>
   </data>
   <data name="XtraTabPage4.Text" xml:space="preserve">
     <value>Workflow - History</value>
@@ -2122,7 +2104,7 @@ zuordnen</value>
     <value>23</value>
   </data>
   <data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1332, 327</value>
+    <value>1336, 330</value>
   </data>
   <data name="XtraTabPage1.Text" xml:space="preserve">
     <value>Workflows/Tasks</value>

app/DD-Record-Organizer/frmRecordView.vb

@@ -69,7 +69,7 @@ Public Class frmRecordView
             'Dim sql_ResultList = String.Format("select * from TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND LANGUAGE = '{1}' ORDER BY SEQUENCE", ENTITY_ID, USER_LANGUAGE)
             expression = String.Format("ENTITY_ID = {0} AND LANGUAGE = '{1}'", ENTITY_ID, USER_LANGUAGE)
             DT_WINDREAM_RESULTLIST = ClassHelper.FILTER_DATATABLE(CURRENT_RESULTLIST_CONFIG, expression, "SEQUENCE") 'ClassDatabase.Return_Datatable(sql_ResultList, True)
-            Dim sql_ResultList = String.Format("select * from TBPMO_DOCRESULT_DROPDOWN_ITEMS WHERE CONFIG_ID IN (SELECT GUID FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND TYPE_ID = 4 AND LANGUAGE = '{1}')", ENTITY_ID, USER_LANGUAGE)
+            Dim sql_ResultList = String.Format("select * from TBPMO_DOCRESULT_DROPDOWN_ITEMS WHERE CONFIG_ID IN (SELECT GUID FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE ENTITY_ID = {0} AND TYPE_ID = 10 AND LANGUAGE = '{1}')", ENTITY_ID, USER_LANGUAGE)
             DT_DOCRESULT_DROPDOWN_ITEMS = ClassDatabase.Return_Datatable(sql_ResultList, True)
             TBPMO_WORKFLOW_TASK_HISTORYTableAdapter.Connection.ConnectionString = MyConnectionString
             ClassWindowLocation.LoadFormLocationSize(Me, 0, CURRENT_SCREEN_ID, "frmRecordView")

app/DD-Record-Organizer/frmWM_IndexFile.vb

@@ -36,6 +36,7 @@ Public Class frmWM_IndexFile
         Dim swWORK_FILE As New SW("WORK_FILE: " & DOCTYPE_IDTextBox.Text)
         Try
             CURRENT_DOC_ID = Nothing
+            Dim odeleteRights As Boolean = True
 
             CURRENT_DOKARTSTRING = vDokart
             Dim err As Boolean = False
@@ -104,6 +105,21 @@ Public Class frmWM_IndexFile
 
                 Dim sql = "SELECT * FROM TBDD_INDEX_AUTOM WHERE ACTIVE = 1 AND UPPER(INDEXNAME) NOT LIKE UPPER('%ONLY %') AND SQL_ACTIVE = 0 AND DOCTYPE_ID = " & vDokart_ID
                 Dim DT_AUTO_INDEXE As DataTable = ClassDatabase.Return_Datatable(sql, True)
+                Try
+                    sql = "SELECT * FROM VWCUST_DOCTYPE_CONFIG WHERE DOCTYPE_ID = " & vDokart_ID
+                    Dim DTVWCUST_DOCTYPE_CONFIG As DataTable = ClassDatabase.Return_Datatable(sql, True)
+                    If Not IsNothing(DTVWCUST_DOCTYPE_CONFIG) Then
+                        For Each oRow As DataRow In DTVWCUST_DOCTYPE_CONFIG.Rows
+                            If oRow.Item(0) = "DELETE_RIGHTS" Then
+                                odeleteRights = CBool(oRow.Item(1))
+                            End If
+                        Next
+                    End If
+                Catch ex As Exception
+                    LOGGER.Warn($"Unexpected error in VWCUST_DOCTYPE_CONFIG Area: {ex.Message}")
+
+                End Try
+
                 Dim indexierung_erfolgreich As Boolean = True
                     'Erst die Objekttyp-Indices indexieren
                     'den Entity-Key auslesen
@@ -312,11 +328,9 @@ Public Class frmWM_IndexFile
                                     End If
                                     MsgBox(stg, MsgBoxStyle.Critical, stg1)
                                 Else
-                                'If CURRENT_REDUNDANT_FORM_ID <> 0 Then
+
-                                '    ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_DOC_ID, CURRENT_FILEIN_WD)
-                                'End If
                                 sw = New SW("Setting_Rights")
-                                If ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_DOC_ID, CURRENT_FILEIN_WD) = False Then
+                                If ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_DOC_ID, CURRENT_FILEIN_WD, odeleteRights) = False Then
                                     MsgBox("The rights for the new file could not be created! Please check the logfile!" & vbNewLine &
                                            "ADDI will try to give You at least reading rights!", MsgBoxStyle.Exclamation)
                                     DD_Rights.ClassRights.SetRightExplicit(CURRENT_DOC_ID, CURRENT_FILEIN_WD, USER_USERNAME, 1)

app/Setup_NoUpdaterVS19/Product.wxs

@@ -163,7 +163,7 @@
       </Component>
       <!-- MAIL.NET Bibliothek -->
       <Component Id="ERPConnectLibs" Guid="9AC1DD00-6225-47DD-A142-1EB462CD5240">
-        <File Id="ERPConnect45" Name="ERPConnect45.dll"  KeyPath="yes" />
+        <File Id="ERPConnect35" Name="ERPConnect35.dll"  KeyPath="yes" />
       </Component>
 
       <!-- Logging -->