From 6ba7bc27c17a6812a77ba3423754d304419c192c Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 21 Apr 2020 12:09:06 +0200 Subject: [PATCH 01/13] load groups/users when only one profile exists, disable extra tabs when no profile exists --- Global_Indexer/frmAdministration.vb | 30 +++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index 4cb6104..82a1260 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -62,10 +62,13 @@ Public Class frmAdministration ComboBox3.DataSource = oDatatable Try - Me.TBDD_DOKUMENTARTTableAdapter.Fill(Me.MyDataset.TBDD_DOKUMENTART) + Me.TBDD_DOKUMENTARTTableAdapter.FillByModuleGI(Me.MyDataset.TBDD_DOKUMENTART) Me.TBDD_EINGANGSARTENTableAdapter.Fill(Me.MyDataset.TBDD_EINGANGSARTEN) Me.TBDD_MODULESTableAdapter.Fill(Me.MyDataset.TBDD_MODULES) + TBDD_DOKUMENTARTBindingSource.ResetBindings(True) + MaybeDisableUserAndEmailTabs() + ' Initialize Profile-GridControl before its tab is loaded ' prevents jumping of selected profile when selected tab is changed GridControl3.ForceInitialize() @@ -77,6 +80,17 @@ Public Class frmAdministration End If End If End Sub + + Private Sub MaybeDisableUserAndEmailTabs() + If MyDataset.TBDD_DOKUMENTART.Rows.Count = 0 Then + XtraTabPageUsersGroups.PageEnabled = False + XtraTabPageEmail.PageEnabled = False + Else + XtraTabPageUsersGroups.PageEnabled = True + XtraTabPageEmail.PageEnabled = True + End If + End Sub + Private Sub ObjektTypenEintragen() Try pnlObjekttype_Config.Enabled = False @@ -204,6 +218,7 @@ Public Class frmAdministration End Try TBDD_DOKUMENTARTTableAdapter.Update(MyDataset.TBDD_DOKUMENTART) + MaybeDisableUserAndEmailTabs() If IsInsert = True Then Dim oNewID As Integer @@ -336,13 +351,19 @@ Public Class frmAdministration If DOKART_GUIDTextBox.Text <> "" Then Load_Dokart() 'Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text) - Load_ZuordnungDokart_Module(DOKART_GUIDTextBox.Text) + If DOKART_GUIDTextBox.Text <> String.Empty Then + Load_ZuordnungDokart_Module(DOKART_GUIDTextBox.Text) + End If + If SUGGESTIONCheckBox.CheckState = CheckState.Checked Then btnSQLView.Visible = True Else btnSQLView.Visible = False End If - Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text) + If DOKART_GUIDTextBox.Text <> String.Empty Then + Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text) + End If + End If frmloaded = True WM_CHECKED_CHANGE() @@ -1076,7 +1097,7 @@ Public Class frmAdministration Dim del As String = " EXEC PRDD_GLOBIX_DELETE_DOCTYPE " & DOKART_GUIDTextBox.Text If ClassDatabase.Execute_non_Query(del, True) = True Then Load_Dokart() - + MaybeDisableUserAndEmailTabs() If USER_LANGUAGE = "de-DE" Then MsgBox("Das Profil wurde erfolgreich gelöscht!", MsgBoxStyle.Information) @@ -1122,6 +1143,7 @@ Public Class frmAdministration Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick LoadGlobix_Doctypes() + MaybeDisableUserAndEmailTabs() End Sub Private Sub BarButtonItem5_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem5.ItemClick From 09bef5bbbd3ec91d1864f1d1bb6ac77e8d38ea27 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 21 Apr 2020 12:09:33 +0200 Subject: [PATCH 02/13] Version 2.0.0.18 --- 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 b4ec23b..479c6ca 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 1e1067e29fad1c5480e4e529f1e756d69fc329ff Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 21 Apr 2020 12:24:22 +0200 Subject: [PATCH 03/13] Marlon: LASS DEN BUTTON BITTE DRIN --- Global_Indexer/frmStart.Designer.vb | 18 ++---- Global_Indexer/frmStart.resx | 96 ++++++++++++++--------------- 2 files changed, 53 insertions(+), 61 deletions(-) diff --git a/Global_Indexer/frmStart.Designer.vb b/Global_Indexer/frmStart.Designer.vb index 6afc7c8..a51498b 100644 --- a/Global_Indexer/frmStart.Designer.vb +++ b/Global_Indexer/frmStart.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmStart Inherits DevExpress.XtraEditors.XtraForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmStart 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStart)) @@ -52,7 +52,6 @@ Partial Class frmStart Me.TBHOTKEY_USER_PROFILETableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBHOTKEY_USER_PROFILETableAdapter() Me.TableAdapterManager = New Global_Indexer.MyDatasetTableAdapters.TableAdapterManager() Me.btnChoosefiles = New System.Windows.Forms.Button() - Me.Button1 = New System.Windows.Forms.Button() Me.MenuStrip1.SuspendLayout() Me.StatusStrip1.SuspendLayout() CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() @@ -221,24 +220,18 @@ Partial Class frmStart Me.btnChoosefiles.Name = "btnChoosefiles" Me.btnChoosefiles.UseVisualStyleBackColor = True ' - 'Button1 - ' - resources.ApplyResources(Me.Button1, "Button1") - Me.Button1.Name = "Button1" - Me.Button1.UseVisualStyleBackColor = True - ' 'frmStart ' Me.AllowDrop = True + Me.Appearance.Options.UseFont = True resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.BackColor = System.Drawing.SystemColors.ControlLight - Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.btnChoosefiles) Me.Controls.Add(Me.LabelControl1) Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.MenuStrip1) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle + Me.IconOptions.Icon = CType(resources.GetObject("frmStart.IconOptions.Icon"), System.Drawing.Icon) Me.MaximizeBox = False Me.Name = "frmStart" Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide @@ -280,5 +273,4 @@ Partial Class frmStart Friend WithEvents LabelLoggedIn As DevExpress.XtraBars.BarStaticItem Friend WithEvents LabelVersion As DevExpress.XtraBars.BarStaticItem Friend WithEvents RibbonMiniToolbar1 As DevExpress.XtraBars.Ribbon.RibbonMiniToolbar - Friend WithEvents Button1 As Button End Class diff --git a/Global_Indexer/frmStart.resx b/Global_Indexer/frmStart.resx index efd9f6b..4e15bef 100644 --- a/Global_Indexer/frmStart.resx +++ b/Global_Indexer/frmStart.resx @@ -121,43 +121,6 @@ 400, 17 - - 0, 0 - - - 295, 24 - - - - 5 - - - MenuStrip1 - - - MenuStrip1 - - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - - - 108, 20 - - - Konfiguration - - - 221, 22 - - - Administration - 232, 22 @@ -170,6 +133,12 @@ Hotkey - Einstellungen + + 221, 22 + + + Administration + 218, 6 @@ -197,9 +166,49 @@ Info + + 108, 20 + + + Konfiguration + + + 0, 0 + + + 295, 24 + + + + 5 + + + MenuStrip1 + + + MenuStrip1 + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + 515, 17 + + 133, 17 + + + FolderWatch ist aktiv + + + False + 0, 137 @@ -224,15 +233,6 @@ 2 - - 133, 17 - - - FolderWatch ist aktiv - - - False - 1072, 17 @@ -639,7 +639,7 @@ auf dieses Fenster oder... Segoe UI, 8.25pt - + AAABAAEAgIUAAAEAGAD4zwAAFgAAACgAAACAAAAACgEAAAEAGAAAAAAAAAAAAEgAAABIAAAAAAAAAAAA AAAAAABGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqoA @@ -1682,6 +1682,6 @@ auf dieses Fenster oder... frmStart - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file From ef1f887489bce687ef89207c07a4d92b5ef16ae1 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 21 Apr 2020 12:24:47 +0200 Subject: [PATCH 04/13] Version 2.0.0.19 --- 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 479c6ca..06bf25f 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 437932c5b5b3673e3c7ba95e936095a43703bfcb Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 21 Apr 2020 13:50:33 +0200 Subject: [PATCH 05/13] fix user/group loading --- Global_Indexer/frmAdministration.Designer.vb | 54 +++++++------------- Global_Indexer/frmAdministration.resx | 42 +++++---------- Global_Indexer/frmAdministration.vb | 27 +++------- 3 files changed, 37 insertions(+), 86 deletions(-) diff --git a/Global_Indexer/frmAdministration.Designer.vb b/Global_Indexer/frmAdministration.Designer.vb index 601054d..e85e15e 100644 --- a/Global_Indexer/frmAdministration.Designer.vb +++ b/Global_Indexer/frmAdministration.Designer.vb @@ -118,10 +118,6 @@ Partial Class frmAdministration Me.BarButtonItem26 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem27 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem28 = New DevExpress.XtraBars.BarButtonItem() - Me.RibbonPageUserGroups = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageEmail = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -129,6 +125,8 @@ Partial Class frmAdministration Me.RibbonPageGroupManualIndexFunctions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupAutoIndex = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupProfileRegex = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageEmail = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.Label12 = New System.Windows.Forms.Label() Me.XtraTabControl3 = New DevExpress.XtraTab.XtraTabControl() @@ -525,7 +523,7 @@ Partial Class frmAdministration resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 38 Me.RibbonControl1.Name = "RibbonControl1" - Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageUserGroups, Me.RibbonPageEmail}) + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageEmail}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowToolbarCustomizeItem = False Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 @@ -747,35 +745,6 @@ Partial Class frmAdministration Me.BarButtonItem28.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem28.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem28.Name = "BarButtonItem28" ' - 'RibbonPageUserGroups - ' - Me.RibbonPageUserGroups.Appearance.BackColor = System.Drawing.Color.SeaGreen - Me.RibbonPageUserGroups.Appearance.Options.UseBackColor = True - Me.RibbonPageUserGroups.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3}) - Me.RibbonPageUserGroups.Name = "RibbonPageUserGroups" - resources.ApplyResources(Me.RibbonPageUserGroups, "RibbonPageUserGroups") - ' - 'RibbonPageGroup3 - ' - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem6) - Me.RibbonPageGroup3.Name = "RibbonPageGroup3" - resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") - ' - 'RibbonPageEmail - ' - Me.RibbonPageEmail.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4}) - Me.RibbonPageEmail.Name = "RibbonPageEmail" - resources.ApplyResources(Me.RibbonPageEmail, "RibbonPageEmail") - ' - 'RibbonPageGroup4 - ' - Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem9) - Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem10) - Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem11) - Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem12) - Me.RibbonPageGroup4.Name = "RibbonPageGroup4" - resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4") - ' 'RibbonPageStart ' Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1, Me.RibbonPageGroupManualIndex, Me.RibbonPageGroupManualIndexFunctions, Me.RibbonPageGroupAutoIndex, Me.RibbonPageGroupProfileRegex}) @@ -839,6 +808,21 @@ Partial Class frmAdministration Me.RibbonPageGroupProfileRegex.Name = "RibbonPageGroupProfileRegex" resources.ApplyResources(Me.RibbonPageGroupProfileRegex, "RibbonPageGroupProfileRegex") ' + 'RibbonPageEmail + ' + Me.RibbonPageEmail.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4}) + Me.RibbonPageEmail.Name = "RibbonPageEmail" + resources.ApplyResources(Me.RibbonPageEmail, "RibbonPageEmail") + ' + 'RibbonPageGroup4 + ' + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem9) + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem10) + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem11) + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem12) + Me.RibbonPageGroup4.Name = "RibbonPageGroup4" + resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4") + ' 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.txtStatus) @@ -2925,8 +2909,6 @@ Partial Class frmAdministration Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageUserGroups As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents Label12 As Label diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index 25c778b..d179874 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -841,12 +841,6 @@ Profil-Verwaltung - - Gruppenzuordnung - - - Profil-Zuordnung - E-Mail Indexierung @@ -7500,30 +7494,6 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageUserGroups - - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup3 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageEmail - - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup4 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RibbonPageStart @@ -7566,6 +7536,18 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RibbonPageEmail + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup4 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + viewAssignedGroups diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index 82a1260..58534ec 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -48,7 +48,6 @@ Public Class frmAdministration oDragDropManager.AddGridView(viewAssignedUsers) oDragDropManager.AddGridView(viewAvailableUsers) - RibbonPageUserGroups.Visible = False RibbonPageEmail.Visible = False Dim oDatatable As New DataTable() @@ -218,7 +217,6 @@ Public Class frmAdministration End Try TBDD_DOKUMENTARTTableAdapter.Update(MyDataset.TBDD_DOKUMENTART) - MaybeDisableUserAndEmailTabs() If IsInsert = True Then Dim oNewID As Integer @@ -229,8 +227,12 @@ Public Class frmAdministration MsgBox("Fehler beim zuweisen des neuen Profils zum Modul Global-Indexer!", MsgBoxStyle.Critical, Text) End If End If + + TBDD_DOKUMENTARTBindingSource.ResetBindings(True) End If + MaybeDisableUserAndEmailTabs() + SetStatus("Profil gespeichert!") Else ClearStatus() @@ -494,21 +496,12 @@ Public Class frmAdministration RibbonControl1.SelectedPage = RibbonPageStart End If - If oSelectedPageName = XtraTabPageUsersGroups.Name Then - RibbonPageUserGroups.Visible = True - RibbonControl1.SelectedPage = RibbonPageUserGroups - Else - RibbonPageUserGroups.Visible = False - 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 @@ -1098,6 +1091,7 @@ Public Class frmAdministration If ClassDatabase.Execute_non_Query(del, True) = True Then Load_Dokart() MaybeDisableUserAndEmailTabs() + TBDD_DOKUMENTARTBindingSource.ResetBindings(True) If USER_LANGUAGE = "de-DE" Then MsgBox("Das Profil wurde erfolgreich gelöscht!", MsgBoxStyle.Information) @@ -1133,7 +1127,9 @@ Public Class frmAdministration MsgBox("Profile was copied successfully and set to INACTIVE." & vbNewLine & "Please note:" & vbNewLine & "- Profile was not assigned to a usergroup", MsgBoxStyle.Information) End If + Load_Dokart() + TBDD_DOKUMENTARTBindingSource.ResetBindings(True) End If Catch ex As Exception MsgBox("Error in Copy Doctype:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -1399,15 +1395,6 @@ Public Class frmAdministration End Try End Sub - Private Sub BarButtonItem6_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem6.ItemClick - If DOKART_GUIDTextBox.Text <> String.Empty Then - Dim profileId As Integer = DOKART_GUIDTextBox.Text - - gridAssignedUsers.DataSource = ClassDatatables.GetAssignedUsers(profileId) - gridAvailableUsers.DataSource = ClassDatatables.GetAvailableUsers(profileId) - End If - End Sub - Private Sub BarButtonItem28_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem28.ItemClick TBGI_REGEX_DOCTYPEBindingSource.AddNew() From 1768ce0add64f200c30e992795397a7b16e87cd2 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 21 Apr 2020 13:54:30 +0200 Subject: [PATCH 06/13] Version 2.0.0.20 --- 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 06bf25f..905602d 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 3235cca1921c63ce4ebfa14fe0b986b8d60249a6 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 22 Apr 2020 13:34:12 +0200 Subject: [PATCH 07/13] ClassWindream: Add Support for Vector Boolean --- Global_Indexer/ClassWindream.vb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Global_Indexer/ClassWindream.vb b/Global_Indexer/ClassWindream.vb index e6e128e..547a003 100644 --- a/Global_Indexer/ClassWindream.vb +++ b/Global_Indexer/ClassWindream.vb @@ -936,6 +936,11 @@ Public Class ClassWindream LOGGER.Info(" ...Typ des windream-Indexes: 4099 Vektor Kommazahl") 'Vektor Kommazahl convertValue = CStr(value) + Case 4100 + vektor = True + LOGGER.Info(" ...Typ des windream-Indexes: 4100 Vektor Boolean") + 'Vektor Kommazahl + convertValue = CBool(value) Case 4101 vektor = True LOGGER.Info(" ...Typ des windream-Indexes: 4101 Vektor Date") From e8f937e52786a6b294abc11477451c60e6f96161 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 22 Apr 2020 13:34:28 +0200 Subject: [PATCH 08/13] 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) From 7c3ae86d522e8234fd3df28c6d763714700575bf Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 22 Apr 2020 13:35:15 +0200 Subject: [PATCH 09/13] Version 2.0.0.21 --- 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 905602d..a04f482 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 11f5af7e897f0da32d6badf929700b59046f9b7c Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 22 Apr 2020 13:54:52 +0200 Subject: [PATCH 10/13] fix boolean conversion --- Global_Indexer/ClassWindream.vb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Global_Indexer/ClassWindream.vb b/Global_Indexer/ClassWindream.vb index 547a003..4ea238e 100644 --- a/Global_Indexer/ClassWindream.vb +++ b/Global_Indexer/ClassWindream.vb @@ -940,7 +940,7 @@ Public Class ClassWindream vektor = True LOGGER.Info(" ...Typ des windream-Indexes: 4100 Vektor Boolean") 'Vektor Kommazahl - convertValue = CBool(value) + convertValue = ToBoolean(value) Case 4101 vektor = True LOGGER.Info(" ...Typ des windream-Indexes: 4101 Vektor Date") @@ -1032,6 +1032,10 @@ Public Class ClassWindream Str = Str.ToString.Replace(" ", "") 'Umwandeln in Double myArray(0) = CDbl(Str.Replace(".", ",")) + + Case 4100 + ' Umwandeln in Boolean + myArray(0) = ToBoolean(value) Case 4101 'Umwandeln in Date myArray(0) = CDate(value) @@ -1762,4 +1766,10 @@ Public Class ClassWindream End Try End Function + + Private Shared Function ToBoolean(input As String) + If String.IsNullOrEmpty(input) Then Return False + Return (input.Trim().ToLower() = "true") OrElse (input.Trim() = "1") + End Function + End Class From 07a5c2748b3d6bc4f02950458513f3380fd2fa72 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 22 Apr 2020 13:57:10 +0200 Subject: [PATCH 11/13] Version 2.0.0.22 --- 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 a04f482..5bff0ee 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 0ef9397f732f181bb351075580e37e8fec8e65ce Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 22 Apr 2020 14:30:06 +0200 Subject: [PATCH 12/13] really fix bool conversion --- Global_Indexer/ClassWindream.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Global_Indexer/ClassWindream.vb b/Global_Indexer/ClassWindream.vb index 4ea238e..f2c220a 100644 --- a/Global_Indexer/ClassWindream.vb +++ b/Global_Indexer/ClassWindream.vb @@ -1240,7 +1240,7 @@ Public Class ClassWindream 'Das Array anpassen ReDim Preserve ValueArray(Anzahl) 'Den Wert im Array speichern - ValueArray(Anzahl) = NewValue.ToString + ValueArray(Anzahl) = NewValue '.ToString Anzahl += 1 Else LOGGER.Info(" >> Value '" & NewValue.ToString & "' bereits in Array enthalten") @@ -1249,7 +1249,7 @@ Public Class ClassWindream 'Das Array anpassen ReDim Preserve ValueArray(Anzahl) 'Den Wert im Array speichern - ValueArray(Anzahl) = NewValue.ToString + ValueArray(Anzahl) = NewValue '.ToString Anzahl += 1 End If @@ -1767,7 +1767,7 @@ Public Class ClassWindream End Function - Private Shared Function ToBoolean(input As String) + Private Shared Function ToBoolean(input As String) As Boolean If String.IsNullOrEmpty(input) Then Return False Return (input.Trim().ToLower() = "true") OrElse (input.Trim() = "1") End Function From 781a4c66dbf4d0967a2312ed96ee302d8a40ea38 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 22 Apr 2020 14:30:45 +0200 Subject: [PATCH 13/13] Version 2.0.0.23 --- 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 5bff0ee..f613f92 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