From 53b069c46ad97c891800b115440ff5af6dc1ef34 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 27 Apr 2020 16:24:59 +0200 Subject: [PATCH 1/9] fix double indexing for auto indexes --- Global_Indexer/frmIndex.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index dd07657..9b5686b 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -769,7 +769,7 @@ Public Class frmIndex indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, indexname, oListofString, CURR_DOKART_OBJECTTYPE) End If - indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, indexname, Indexvalue, CURR_DOKART_OBJECTTYPE) + 'indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, indexname, Indexvalue, CURR_DOKART_OBJECTTYPE) If indexierung_erfolgreich = False Then MsgBox("Error in indexing file - See log", MsgBoxStyle.Critical) Return False From f6889b326035be93f9271d589289865c6cd41415 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 27 Apr 2020 16:25:34 +0200 Subject: [PATCH 2/9] Version 2.0.0.25 --- Global_Indexer/My Project/AssemblyInfo.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index 091f3a1..6ecfde4 100644 --- a/Global_Indexer/My Project/AssemblyInfo.vb +++ b/Global_Indexer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file From 59a44ae6fc03bb4794e3e232b0aeb505dba96e66 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 27 Apr 2020 16:28:00 +0200 Subject: [PATCH 3/9] fix modules.windream filename --- SetupVS19/Product.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SetupVS19/Product.wxs b/SetupVS19/Product.wxs index 4c996ac..cb470ac 100644 --- a/SetupVS19/Product.wxs +++ b/SetupVS19/Product.wxs @@ -115,7 +115,7 @@ - + From 94fa4c15a349f0bfbdcb2845be13bbe9406a19ae Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 28 Apr 2020 13:41:57 +0200 Subject: [PATCH 4/9] frmAdministration: Fix Index Loading (again), fix user/group assignments not loading when only 1 profile exists --- Global_Indexer/frmAdministration.vb | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index dc4dc9c..0a4338a 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -312,16 +312,15 @@ Public Class frmAdministration End Sub Sub load_WDIndices() Try - If Me.OBJEKTTYPComboBox.SelectedIndex <> -1 Then + If OBJEKTTYPComboBox.Text <> "" Then Me.WD_INDEXComboBox.Items.Clear() Me.WD_INDEXComboBox.Items.Add("") Me.INDEXNAME_AutoIndexCMB.Items.Clear() + If SourceAttributes Is Nothing Then SourceAttributes = WINDREAM.GetIndiciesByObjecttype(OBJEKTTYPComboBox.Text) End If - - If SourceAttributes IsNot Nothing Then For Each index As String In SourceAttributes Me.WD_INDEXComboBox.Items.Add(index) @@ -333,6 +332,8 @@ Public Class frmAdministration MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in load_WDIndices: ") End Try End Sub + + Private Sub frmAdministration_Shown(sender As Object, e As EventArgs) Handles Me.Shown If DOKART_GUIDTextBox.Text <> "" Then Load_Dokart() @@ -473,14 +474,19 @@ Public Class frmAdministration RibbonControl1.SelectedPage = RibbonPageStart End If + If oSelectedPageName = XtraTabPageUsersGroups.Name And DOKART_GUIDTextBox.Text <> "" Then + gridAssignedGroups.DataSource = ClassDatatables.GetAssignedGroups(DOKART_GUIDTextBox.Text) + gridAvailableGroups.DataSource = ClassDatatables.GetAvailableGroups(DOKART_GUIDTextBox.Text) + gridAssignedUsers.DataSource = ClassDatatables.GetAssignedUsers(DOKART_GUIDTextBox.Text) + gridAvailableUsers.DataSource = ClassDatatables.GetAvailableUsers(DOKART_GUIDTextBox.Text) + End If + If oSelectedPageName = XtraTabPageEmail.Name Then RibbonPageEmail.Visible = True If oSelectedPageName = XtraTabPageEmail.Name Then RibbonControl1.SelectedPage = RibbonPageEmail End If - - Else RibbonPageEmail.Visible = False End If @@ -1242,6 +1248,10 @@ Public Class frmAdministration Private Sub BarButtonItem16_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem16.ItemClick TBDD_INDEX_MANBindingSource.AddNew() + + If WINDREAM_DIRECTCheckBox.Checked = True Then + load_WDIndices() + End If End Sub Private Sub BarButtonItem17_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem17.ItemClick @@ -1317,6 +1327,10 @@ Public Class frmAdministration Private Sub BarButtonItem24_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem24.ItemClick TBDD_INDEX_AUTOMBindingSource.AddNew() + + If WINDREAM_DIRECTCheckBox.Checked = True Then + load_WDIndices() + End If End Sub Private Sub ToolStripButton17_Click(sender As Object, e As EventArgs) From 358071d35c23ae384986ae3da32d436d16c9b4eb Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 28 Apr 2020 13:42:56 +0200 Subject: [PATCH 5/9] Version 2.0.0.26 --- Global_Indexer/My Project/AssemblyInfo.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index 6ecfde4..7b97b32 100644 --- a/Global_Indexer/My Project/AssemblyInfo.vb +++ b/Global_Indexer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file From bc6459e70adde1d538a3c09f6a507099f37074a7 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 29 Apr 2020 11:45:43 +0200 Subject: [PATCH 6/9] raise max order value to 999 --- Global_Indexer/frmAdministration.Designer.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/Global_Indexer/frmAdministration.Designer.vb b/Global_Indexer/frmAdministration.Designer.vb index e85e15e..a79e554 100644 --- a/Global_Indexer/frmAdministration.Designer.vb +++ b/Global_Indexer/frmAdministration.Designer.vb @@ -2115,6 +2115,7 @@ Partial Class frmAdministration ' Me.SEQUENCENumericUpDown.DataBindings.Add(New System.Windows.Forms.Binding("Value", Me.TBDD_DOKUMENTARTBindingSource, "SEQUENCE", True)) resources.ApplyResources(Me.SEQUENCENumericUpDown, "SEQUENCENumericUpDown") + Me.SEQUENCENumericUpDown.Maximum = New Decimal(New Integer() {999, 0, 0, 0}) Me.SEQUENCENumericUpDown.Name = "SEQUENCENumericUpDown" ' 'GEANDERTWERTextBox From 1404c42cdaa11f26003c23a48f2cc1cfb645cce5 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 29 Apr 2020 11:46:21 +0200 Subject: [PATCH 7/9] write droptype = empty to debug --- Global_Indexer/frmIndex.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 9b5686b..ad578fa 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -1384,7 +1384,7 @@ Public Class frmIndex DocumentViewer1.Init(LOGCONFIG, VIEWER_LICENSE) If DropType Is Nothing Then - LOGGER.Warn("File with Id [{0}] was not found in TBGI_FILES_USER. Exiting.") + LOGGER.Debug("File with Id [{0}] was not found in TBGI_FILES_USER. Exiting.", CURRENT_WORKFILE_GUID) CancelAttempts = MaxCancelAttempts Close() Else From c03a75254b4e01ba5942d662f6d1cb4c8470e8d7 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 29 Apr 2020 12:10:05 +0200 Subject: [PATCH 8/9] link multiselect to index type (is vector) --- Global_Indexer/frmAdministration.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index 0a4338a..f92d834 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -455,12 +455,12 @@ Public Class frmAdministration If frmloaded = True Then If SUGGESTIONCheckBox.CheckState = CheckState.Checked Then btnSQLView.Visible = True - MULTISELECTCheckBox.Visible = True + 'MULTISELECTCheckBox.Visible = True VKT_ADD_ITEMCheckbox.Visible = True VKT_PREVENT_MULTIPLE_VALUESCheckbox.Visible = True Else btnSQLView.Visible = False - MULTISELECTCheckBox.Visible = False + 'MULTISELECTCheckBox.Visible = False VKT_ADD_ITEMCheckbox.Visible = False VKT_PREVENT_MULTIPLE_VALUESCheckbox.Visible = False End If @@ -992,11 +992,11 @@ Public Class frmAdministration Private Sub WD_INDEXComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles WD_INDEXComboBox.SelectedIndexChanged _indexIsVectorField = indexIsVectorField() MULTISELECTCheckBox.Visible = _indexIsVectorField - VKT_PREVENT_MULTIPLE_VALUESCheckbox.Visible = _indexIsVectorField + 'VKT_PREVENT_MULTIPLE_VALUESCheckbox.Visible = _indexIsVectorField If Not _indexIsVectorField Then MULTISELECTCheckBox.Checked = False - VKT_PREVENT_MULTIPLE_VALUESCheckbox.Checked = False + 'VKT_PREVENT_MULTIPLE_VALUESCheckbox.Checked = False End If End Sub From 334dfc8037f6fadb12f8633c4addc3630948de79 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 29 Apr 2020 12:10:34 +0200 Subject: [PATCH 9/9] Version 2.0.0.27 --- Global_Indexer/My Project/AssemblyInfo.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index 7b97b32..6d40c86 100644 --- a/Global_Indexer/My Project/AssemblyInfo.vb +++ b/Global_Indexer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file