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

Compare commits

base: AppStd:14b1347128d8a6c93b7aa6f9c1a56597de724fff
Branches Tags
AppStd:master AppStd:Design AppStd:Limilabs AppStd:Redesign
...
compare: AppStd:6042b7321d0fb4a17f6ad58df9d615e591d622f2
Branches Tags
AppStd:master AppStd:Design AppStd:Limilabs AppStd:Redesign

2 Commits
14b1347128 ... 6042b7321d

Author SHA1 Message Date
Jonathan Jenne
6042b7321d Version 2.3.2.0 2021-01-28 12:37:18 +01:00
Jonathan Jenne
17bdcb3af7 Fix duplicate profiles showing in index window 2021-01-28 12:36:50 +01:00
2 changed files with 9 additions and 10 deletions
Expand all files Collapse all files

2
Global_Indexer/My Project/AssemblyInfo.vb
View File

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

17
Global_Indexer/frmIndex.vb
View File

@@ -13,7 +13,6 @@ Public Class frmIndex
Private MULTIFILES As Integer Private MULTIFILES As Integer
Private akttxtbox As TextBox Private akttxtbox As TextBox
Dim DT_INDEXEMAN As DataTable Dim DT_INDEXEMAN As DataTable
Dim DT_DOKART As DataTable
Public FormLoaded As Boolean = False Public FormLoaded As Boolean = False
Private Shared _Instance As frmIndex = Nothing Private Shared _Instance As frmIndex = Nothing
Dim DropType As String Dim DropType As String
@@ -1546,12 +1545,12 @@ Public Class frmIndex
End Sub End Sub
Sub Refresh_Dokart() Sub Refresh_Dokart()
Try Try
Dim sql = String.Format("SELECT DISTINCT * FROM VWGI_DOCTYPE where UPPER(USERNAME) = UPPER('{0}') ORDER BY SEQUENCE", Environment.UserName) Dim sql = String.Format("SELECT DISTINCT DOCTYPE_ID, DOCTYPE, SEQUENCE FROM VWGI_DOCTYPE where UPPER(USERNAME) = UPPER('{0}') ORDER BY SEQUENCE", Environment.UserName)
_Logger.Info("SQL DoctypeList: " & sql) _Logger.Info("SQL DoctypeList: " & sql)
DT_DOKART = ClassDatabase.Return_Datatable(sql) Dim oDoctypes = ClassDatabase.Return_Datatable(sql)
cmbDokumentart.DataSource = DT_DOKART cmbDokumentart.DataSource = oDoctypes
cmbDokumentart.ValueMember = DT_DOKART.Columns("DOCTYPE_ID").ColumnName cmbDokumentart.ValueMember = oDoctypes.Columns("DOCTYPE_ID").ColumnName
cmbDokumentart.DisplayMember = DT_DOKART.Columns("DOCTYPE").ColumnName cmbDokumentart.DisplayMember = oDoctypes.Columns("DOCTYPE").ColumnName
cmbDokumentart.AutoCompleteMode = AutoCompleteMode.Suggest cmbDokumentart.AutoCompleteMode = AutoCompleteMode.Suggest
cmbDokumentart.AutoCompleteSource = AutoCompleteSource.ListItems cmbDokumentart.AutoCompleteSource = AutoCompleteSource.ListItems
cmbDokumentart.SelectedIndex = -1 cmbDokumentart.SelectedIndex = -1
@@ -1575,10 +1574,10 @@ Public Class frmIndex
Me.pnlIndex.Controls.Clear() Me.pnlIndex.Controls.Clear()
Dim sql As String = "Select WINDREAM_DIRECT, DUPLICATE_HANDLING from TBDD_DOKUMENTART WHERE GUID = " & cmbDokumentart.SelectedValue Dim sql As String = "Select WINDREAM_DIRECT, DUPLICATE_HANDLING from TBDD_DOKUMENTART WHERE GUID = " & cmbDokumentart.SelectedValue
Dim DT_DOKART As DataTable = ClassDatabase.Return_Datatable(sql) Dim oDoctypes As DataTable = ClassDatabase.Return_Datatable(sql)
WDDirect = DT_DOKART.Rows(0).Item("WINDREAM_DIRECT") WDDirect = oDoctypes.Rows(0).Item("WINDREAM_DIRECT")
CURRENT_DOKART_DUPLICATE_HANDLING = DT_DOKART.Rows(0).Item("DUPLICATE_HANDLING") CURRENT_DOKART_DUPLICATE_HANDLING = oDoctypes.Rows(0).Item("DUPLICATE_HANDLING")
Refresh_IndexeMan(cmbDokumentart.SelectedValue) Refresh_IndexeMan(cmbDokumentart.SelectedValue)
End If End If