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-16 11:16:53 +01:00
commit 742986a5a9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb
View File

@ -376,10 +376,10 @@ Public Class frmAdmin_Globix
Case XtraTabPageDynamicFolder.Name Case XtraTabPageDynamicFolder.Name
cmbAllAttributes.Items.Clear() cmbAllAttributes.Items.Clear()
For Each oRowMan As DataRow In Me.GlobixDataset.TBDD_INDEX_MAN.Rows For Each oRowMan As DataRow In Me.GlobixDataset.TBDD_INDEX_MAN.Rows
cmbAllAttributes.Items.Add(oRowMan.Item("WD_INDEX")) cmbAllAttributes.Items.Add(oRowMan.Item("WD_INDEX") + " - M")
Next Next
For Each oRowMan As DataRow In Me.GlobixDataset.TBDD_INDEX_AUTOM.Rows For Each oRowMan As DataRow In Me.GlobixDataset.TBDD_INDEX_AUTOM.Rows
cmbAllAttributes.Items.Add(oRowMan.Item("INDEXNAME")) cmbAllAttributes.Items.Add(oRowMan.Item("INDEXNAME") + " - A")
Next Next
End Select End Select
'Else 'Else
@ -512,9 +512,9 @@ Public Class frmAdmin_Globix
If cmbAllAttributes.SelectedIndex <> -1 Then If cmbAllAttributes.SelectedIndex <> -1 Then
Dim oPattern As String Dim oPattern As String
If cmbAllAttributes.Text.EndsWith("#M") Then If cmbAllAttributes.Text.EndsWith("M") Then
oPattern = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_ATTR_MAN, cmbAllAttributes.Text) oPattern = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_ATTR_MAN, cmbAllAttributes.Text)
Else ElseIf cmbAllAttributes.Text.EndsWith("A") Then
oPattern = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_ATTR_AUTO, cmbAllAttributes.Text) oPattern = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_ATTR_AUTO, cmbAllAttributes.Text)
End If End If
Me.FOLDER_FOR_INDEXTextEdit.Text = str & oPattern Me.FOLDER_FOR_INDEXTextEdit.Text = str & oPattern

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

@ -304,11 +304,11 @@ 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 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 Dim oSql = String.Format($"SELECT A.DOCTYPE_ID,A.USERNAME,DL.Doctype,A.OBJECT_ST_NAME, DL.Doctype_ID as IDBDoctype_ID,DL.LANG_CODE,A.SEQUENCE 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") 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}' AND DL.LANG_CODE = '{My.Application.User.Language}' 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}' AND LANG_CODE = '{My.Application.User.Language}'")
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 {