From e8f937e52786a6b294abc11477451c60e6f96161 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Wed, 22 Apr 2020 13:34:28 +0200
Subject: [PATCH] frmAdministration: Fix Index Loading

---
 Global_Indexer/frmAdministration.vb | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb
index 58534ec..c3df90e 100644
--- a/Global_Indexer/frmAdministration.vb
+++ b/Global_Indexer/frmAdministration.vb
@@ -60,6 +60,10 @@ Public Class frmAdministration
 
         ComboBox3.DataSource = oDatatable
 
+        If GI_withWindream = True Then
+            If ClassWindream.Init() = True Then
+            End If
+        End If
         Try
             Me.TBDD_DOKUMENTARTTableAdapter.FillByModuleGI(Me.MyDataset.TBDD_DOKUMENTART)
             Me.TBDD_EINGANGSARTENTableAdapter.Fill(Me.MyDataset.TBDD_EINGANGSARTEN)
@@ -74,10 +78,7 @@ Public Class frmAdministration
         Catch ex As Exception
             MsgBox("Error in frmAdministration_Load: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
         End Try
-        If GI_withWindream = True Then
-            If ClassWindream.Init() = True Then
-            End If
-        End If
+
     End Sub
 
     Private Sub MaybeDisableUserAndEmailTabs()
@@ -265,6 +266,11 @@ Public Class frmAdministration
             gridAssignedUsers.DataSource = ClassDatatables.GetAssignedUsers(CURRENT_DOKART_ID)
             gridAvailableUsers.DataSource = ClassDatatables.GetAvailableUsers(CURRENT_DOKART_ID)
 
+            If WINDREAM_DIRECTCheckBox.Checked = True Then
+                load_WDIndices()
+                load_WDIndices2AutoIndizes()
+            End If
+
             If TextBox3.Text = String.Empty Then
                 TextBox5.Enabled = False
                 TextBox1.Enabled = False
@@ -316,13 +322,13 @@ Public Class frmAdministration
     Private Sub OBJEKTTYPComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles OBJEKTTYPComboBox.SelectedIndexChanged
         If WINDREAM_DIRECTCheckBox.Checked = True Then
             load_WDIndices()
+            load_WDIndices2AutoIndizes()
         End If
     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("")
                 Dim indexe = ClassWindream.GetIndicesByObjecttype(OBJEKTTYPComboBox.Text)
                 If indexe IsNot Nothing Then
                     For Each index As String In indexe
@@ -336,7 +342,7 @@ Public Class frmAdministration
     End Sub
     Sub load_WDIndices2AutoIndizes()
         Try
-            If Me.OBJEKTTYPComboBox.SelectedIndex <> -1 Then
+            If OBJEKTTYPComboBox.Text <> "" Then
                 Me.INDEXNAME_AutoIndexCMB.Items.Clear()
                 Dim indexe = ClassWindream.GetIndicesByObjecttype(OBJEKTTYPComboBox.Text)
                 If indexe IsNot Nothing Then
@@ -1255,6 +1261,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
@@ -1330,6 +1340,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_WDIndices2AutoIndizes()
+        End If
     End Sub
 
     Private Sub ToolStripButton17_Click(sender As Object, e As EventArgs)