diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index 091f3a1..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 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 diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index dc4dc9c..f92d834 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() @@ -454,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 @@ -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 @@ -986,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 @@ -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) diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index b5cf23d..554d74c 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -771,7 +771,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 @@ -1386,7 +1386,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