diff --git a/GUIs.ZooFlow/Modules/Globix/Models/DocumentType.vb b/GUIs.ZooFlow/Modules/Globix/Models/DocumentType.vb index d0bfcc79..bc8f904f 100644 --- a/GUIs.ZooFlow/Modules/Globix/Models/DocumentType.vb +++ b/GUIs.ZooFlow/Modules/Globix/Models/DocumentType.vb @@ -3,6 +3,8 @@ Public Property Guid Public Property Name Public Property ObjectStore + Public Property IDB_DoctypeID As Integer + Public Property BusinessEntity Public Overrides Function ToString() As String Return Name diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb index 03004f64..ea0aafbb 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb @@ -304,7 +304,8 @@ Public Class frmGlobix_Index Sub Refresh_Dokart() Try Dim oDocTypes As New List(Of DocType) - Dim oSql = String.Format("SELECT * FROM VWGI_DOCTYPE_USER WHERE AKTIV = 1 AND USERNAME = '{0}' ORDER BY SEQUENCE", My.Application.User.UserName) + Dim oSql = String.Format($"SELECT A.DOCTYPE_ID,DL.Doctype,A.OBJECT_ST_NAME, DL.Doctype_ID as IDBDoctype_ID FROM VWGI_DOCTYPE_USER A INNER JOIN TBDD_DOKUMENTART DT ON A.DOCTYPE_ID = DT.GUID +INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_ID WHERE A.AKTIV = 1 AND A.USERNAME = '{My.Application.User.UserName}' ORDER BY A.SEQUENCE") Dim oTable = Database.GetDatatable("VWGI_DOCTYPE_USER", oSql, ECM, pSortByColumn:="SEQUENCE", pFilterExpression:=$"AKTIV = 1 AND USERNAME = '{My.Application.User.UserName}'") @@ -312,8 +313,9 @@ Public Class frmGlobix_Index For Each oRow As DataRow In oTable.Rows Dim oDocType = New DocType With { .Guid = oRow.Item("DOCTYPE_ID"), - .Name = oRow.Item("DOCTYPE"), - .ObjectStore = oRow.Item("OBJECT_ST_NAME") + .Name = oRow.Item("Doctype"), + .ObjectStore = oRow.Item("OBJECT_ST_NAME"), + .IDB_DoctypeID = oRow.Item("IDBDoctype_ID") } oDocTypes.Add(oDocType) @@ -761,7 +763,7 @@ Public Class frmGlobix_Index Dim oObjectStore As String = SelectedDocType.ObjectStore Dim oObjectKind As String = "DOC" Dim oBusinessEntity As String = "DEFAULT" - + ' sd Dim oProfileId As Integer = SelectedDocType.Guid Dim oAttributes As List(Of UserAttributeValue) = oValues Dim oOptions As New Options.ImportFileOptions