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

Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo

Browse Source
This commit is contained in:
Jonathan Jenne 2022-03-09 14:10:12 +01:00
commit e9662a9835
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GUIs.ZooFlow/Modules/Globix/Models/DocumentType.vb
View File

@ -3,6 +3,8 @@
Public Property Guid Public Property Guid
Public Property Name Public Property Name
Public Property ObjectStore Public Property ObjectStore
Public Property IDB_DoctypeID As Integer
Public Property BusinessEntity
Public Overrides Function ToString() As String Public Overrides Function ToString() As String
Return Name Return Name

10
GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb
View File

@ -304,7 +304,8 @@ Public Class frmGlobix_Index
Sub Refresh_Dokart() Sub Refresh_Dokart()
Try Try
Dim oDocTypes As New List(Of DocType) 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, Dim oTable = Database.GetDatatable("VWGI_DOCTYPE_USER", oSql, ECM,
pSortByColumn:="SEQUENCE", pSortByColumn:="SEQUENCE",
pFilterExpression:=$"AKTIV = 1 AND USERNAME = '{My.Application.User.UserName}'") 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 For Each oRow As DataRow In oTable.Rows
Dim oDocType = New DocType With { Dim oDocType = New DocType With {
.Guid = oRow.Item("DOCTYPE_ID"), .Guid = oRow.Item("DOCTYPE_ID"),
.Name = oRow.Item("DOCTYPE"), .Name = oRow.Item("Doctype"),
.ObjectStore = oRow.Item("OBJECT_ST_NAME") .ObjectStore = oRow.Item("OBJECT_ST_NAME"),
.IDB_DoctypeID = oRow.Item("IDBDoctype_ID")
} }
oDocTypes.Add(oDocType) oDocTypes.Add(oDocType)
@ -761,7 +763,7 @@ Public Class frmGlobix_Index
Dim oObjectStore As String = SelectedDocType.ObjectStore Dim oObjectStore As String = SelectedDocType.ObjectStore
Dim oObjectKind As String = "DOC" Dim oObjectKind As String = "DOC"
Dim oBusinessEntity As String = "DEFAULT" Dim oBusinessEntity As String = "DEFAULT"
' sd
Dim oProfileId As Integer = SelectedDocType.Guid Dim oProfileId As Integer = SelectedDocType.Guid
Dim oAttributes As List(Of UserAttributeValue) = oValues Dim oAttributes As List(Of UserAttributeValue) = oValues
Dim oOptions As New Options.ImportFileOptions Dim oOptions As New Options.ImportFileOptions