Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ProcessManager

Fix Additional search ui, fix fallback sql for data searches
Move Grid Fontsizedelta to frmMain
2022-04-06 14:47:43 +02:00 · 2022-04-06 14:47:14 +02:00 · 2022-04-06 12:07:50 +02:00
7 changed files with 367 additions and 296 deletions
--- a/app/DD_PM_WINDREAM/frmKonfig.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmKonfig.Designer.vb
@@ -42,7 +42,6 @@ Partial Class frmKonfig
        Me.txtActualConnection = New System.Windows.Forms.TextBox()
        Me.txtServer = New System.Windows.Forms.TextBox()
        Me.TabPage3 = New System.Windows.Forms.TabPage()
-        Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl()
        Me.Button4 = New System.Windows.Forms.Button()
        Me.Label7 = New System.Windows.Forms.Label()
        Me.txtIntervall = New System.Windows.Forms.TextBox()
@@ -64,7 +63,6 @@ Partial Class frmKonfig
        Me.TBPM_KONFIGURATIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter()
        Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager()
        Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
-        Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit()
        Me.TabControl1.SuspendLayout()
        Me.TabPage2.SuspendLayout()
        Me.TabPage3.SuspendLayout()
@@ -74,7 +72,6 @@ Partial Class frmKonfig
        CType(Me.gvLogs, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'OpenFileDialog1
@@ -196,8 +193,6 @@ Partial Class frmKonfig
        '
        'TabPage3
        '
-        Me.TabPage3.Controls.Add(Me.ComboBoxEdit1)
-        Me.TabPage3.Controls.Add(Me.LabelControl1)
        Me.TabPage3.Controls.Add(Me.Button4)
        Me.TabPage3.Controls.Add(Me.Label7)
        Me.TabPage3.Controls.Add(Me.txtIntervall)
@@ -212,13 +207,6 @@ Partial Class frmKonfig
        Me.TabPage3.Name = "TabPage3"
        Me.TabPage3.UseVisualStyleBackColor = True
        '
-        'LabelControl1
-        '
-        Me.LabelControl1.Appearance.Font = CType(resources.GetObject("LabelControl1.Appearance.Font"), System.Drawing.Font)
-        Me.LabelControl1.Appearance.Options.UseFont = True
-        resources.ApplyResources(Me.LabelControl1, "LabelControl1")
-        Me.LabelControl1.Name = "LabelControl1"
-        '
        'Button4
        '
        resources.ApplyResources(Me.Button4, "Button4")
@@ -351,14 +339,6 @@ Partial Class frmKonfig
        Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing
        Me.TableAdapterManager.UpdateOrder = DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
        '
-        'ComboBoxEdit1
-        '
-        resources.ApplyResources(Me.ComboBoxEdit1, "ComboBoxEdit1")
-        Me.ComboBoxEdit1.Name = "ComboBoxEdit1"
-        Me.ComboBoxEdit1.Properties.Appearance.Font = CType(resources.GetObject("ComboBoxEdit1.Properties.Appearance.Font"), System.Drawing.Font)
-        Me.ComboBoxEdit1.Properties.Appearance.Options.UseFont = True
-        Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("ComboBoxEdit1.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))})
-        '
        'frmKonfig
        '
        resources.ApplyResources(Me, "$this")
@@ -377,7 +357,6 @@ Partial Class frmKonfig
        CType(Me.gvLogs, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)

    End Sub
@@ -420,6 +399,4 @@ Partial Class frmKonfig
    Friend WithEvents LogNachrichtenLeerenToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents SpeichereLogAlsToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents SaveFileDialog1 As SaveFileDialog
-    Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl
-    Friend WithEvents ComboBoxEdit1 As DevExpress.XtraEditors.ComboBoxEdit
 End Class
--- a/app/DD_PM_WINDREAM/frmKonfig.resx
+++ b/app/DD_PM_WINDREAM/frmKonfig.resx
@@ -507,61 +507,6 @@
  <data name="&gt;&gt;TabPage2.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
-  <data name="ComboBoxEdit1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 225</value>
-  </data>
-  <data name="ComboBoxEdit1.Properties.Appearance.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 9.75pt</value>
-  </data>
-  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="ComboBoxEdit1.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
-    <value>Combo</value>
-  </data>
-  <data name="ComboBoxEdit1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>146, 22</value>
-  </data>
-  <data name="ComboBoxEdit1.TabIndex" type="System.Int32, mscorlib">
-    <value>49</value>
-  </data>
-  <data name="&gt;&gt;ComboBoxEdit1.Name" xml:space="preserve">
-    <value>ComboBoxEdit1</value>
-  </data>
-  <data name="&gt;&gt;ComboBoxEdit1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;ComboBoxEdit1.Parent" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;ComboBoxEdit1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="LabelControl1.Appearance.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 9.75pt</value>
-  </data>
-  <data name="LabelControl1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 203</value>
-  </data>
-  <data name="LabelControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>146, 16</value>
-  </data>
-  <data name="LabelControl1.TabIndex" type="System.Int32, mscorlib">
-    <value>48</value>
-  </data>
-  <data name="LabelControl1.Text" xml:space="preserve">
-    <value>Schriftgröße in Übersicht:</value>
-  </data>
-  <data name="&gt;&gt;LabelControl1.Name" xml:space="preserve">
-    <value>LabelControl1</value>
-  </data>
-  <data name="&gt;&gt;LabelControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;LabelControl1.Parent" xml:space="preserve">
-    <value>TabPage3</value>
-  </data>
-  <data name="&gt;&gt;LabelControl1.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
  <data name="Button4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
  </data>
@@ -587,7 +532,7 @@
    <value>TabPage3</value>
  </data>
  <data name="&gt;&gt;Button4.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>0</value>
  </data>
  <data name="Label7.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -614,7 +559,7 @@
    <value>TabPage3</value>
  </data>
  <data name="&gt;&gt;Label7.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>1</value>
  </data>
  <data name="txtIntervall.Location" type="System.Drawing.Point, System.Drawing">
    <value>8, 162</value>
@@ -638,7 +583,7 @@
    <value>TabPage3</value>
  </data>
  <data name="&gt;&gt;txtIntervall.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>2</value>
  </data>
  <data name="Label6.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -665,7 +610,7 @@
    <value>TabPage3</value>
  </data>
  <data name="&gt;&gt;Label6.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>3</value>
  </data>
  <data name="btnopenlog.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleLeft</value>
@@ -692,7 +637,7 @@
    <value>TabPage3</value>
  </data>
  <data name="&gt;&gt;btnopenlog.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>4</value>
  </data>
  <data name="chkLogErrorsOnly.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -719,7 +664,7 @@
    <value>TabPage3</value>
  </data>
  <data name="&gt;&gt;chkLogErrorsOnly.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>5</value>
  </data>
  <data name="Button3.Location" type="System.Drawing.Point, System.Drawing">
    <value>8, 64</value>
@@ -743,7 +688,7 @@
    <value>TabPage3</value>
  </data>
  <data name="&gt;&gt;Button3.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>6</value>
  </data>
  <data name="LinkLabel1.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
@@ -770,7 +715,7 @@
    <value>TabPage3</value>
  </data>
  <data name="&gt;&gt;LinkLabel1.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>7</value>
  </data>
  <data name="Button1.Location" type="System.Drawing.Point, System.Drawing">
    <value>438, 64</value>
@@ -794,7 +739,7 @@
    <value>TabPage3</value>
  </data>
  <data name="&gt;&gt;Button1.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>8</value>
  </data>
  <data name="btnLogMail.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleLeft</value>
@@ -824,7 +769,7 @@
    <value>TabPage3</value>
  </data>
  <data name="&gt;&gt;btnLogMail.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>9</value>
  </data>
  <data name="TabPage3.Location" type="System.Drawing.Point, System.Drawing">
    <value>4, 26</value>
--- a/app/DD_PM_WINDREAM/frmKonfig.vb
+++ b/app/DD_PM_WINDREAM/frmKonfig.vb
@@ -26,17 +26,7 @@ Public Class frmKonfig
            txtIntervall.Text = CONFIG.Config.ReminderTimer


-            Dim oFontSettings = New List(Of FontSetting) From {
-                New FontSetting With {.Title = "Kleiner", .Value = -2},
-                New FontSetting With {.Title = "Normal", .Value = 0},
-                New FontSetting With {.Title = "Größer", .Value = 2}
-            }

-            ComboBoxEdit1.Properties.Items.Clear()
-            ComboBoxEdit1.Properties.Items.AddRange(oFontSettings)
-            ComboBoxEdit1.SelectedItem = oFontSettings.
-                Where(Function(item) item.Value = CONFIG.Config.GridFontSizeDelta).
-                FirstOrDefault()


        Catch ex As Exception
@@ -45,15 +35,6 @@ Public Class frmKonfig
        End Try
    End Sub

-    Public Class FontSetting
-        Public Property Title As String
-        Public Property Value As Integer
-
-        Public Overrides Function ToString() As String
-            Return Title
-        End Function
-    End Class
-

    Private Sub cmbDatenbank_Click(sender As System.Object, e As System.EventArgs) Handles cmbDatenbank.Click
        Try
@@ -273,12 +254,4 @@ Public Class frmKonfig
            MsgBox("Error in Export: " & ex.Message)
        End Try
    End Sub
-
-    Private Sub ComboBoxEdit1_SelectedValueChanged(sender As Object, e As EventArgs) Handles ComboBoxEdit1.SelectedValueChanged
-        Try
-            CONFIG.Config.GridFontSizeDelta = DirectCast(ComboBoxEdit1.EditValue, FontSetting).Value
-            CONFIG.Save()
-        Catch ex As Exception
-        End Try
-    End Sub
 End Class
--- a/app/DD_PM_WINDREAM/frmMain.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb
@@ -174,6 +174,10 @@ Partial Class frmMain
        Me.bwBasicData = New System.ComponentModel.BackgroundWorker()
        Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components)
        Me.TimerInactivity = New System.Windows.Forms.Timer(Me.components)
+        Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RepositoryItemTrackBar1 = New DevExpress.XtraEditors.Repository.RepositoryItemTrackBar()
+        Me.barItemGridFontSize = New DevExpress.XtraBars.BarEditItem()
+        Me.cmbGridFontSize = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox()
        CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
        CType(Me.GridControl_Docs, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -189,6 +193,8 @@ Partial Class frmMain
        CType(Me.RepositoryItemZoomTrackBar1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PrintPreviewRepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RepositoryItemTrackBar1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.cmbGridFontSize, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'ImageListProfile
@@ -366,12 +372,12 @@ Partial Class frmMain
        'RibbonControl1
        '
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch, Me.barItemGridFontSize})
        resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 40
+        Me.RibbonControl1.MaxItemId = 42
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3, Me.RibbonPage4})
-        Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemProgressBar1})
+        Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemProgressBar1, Me.RepositoryItemTrackBar1, Me.cmbGridFontSize})
        Me.RibbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2013
        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
        Me.RibbonControl1.ShowToolbarCustomizeItem = False
@@ -753,7 +759,7 @@ Partial Class frmMain
        '
        'RibbonPage3
        '
-        Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup6})
+        Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup6, Me.RibbonPageGroup5})
        Me.RibbonPage3.Name = "RibbonPage3"
        resources.ApplyResources(Me.RibbonPage3, "RibbonPage3")
        '
@@ -1404,6 +1410,35 @@ Partial Class frmMain
        'TimerInactivity
        '
        '
+        'RibbonPageGroup5
+        '
+        Me.RibbonPageGroup5.ItemLinks.Add(Me.barItemGridFontSize)
+        Me.RibbonPageGroup5.Name = "RibbonPageGroup5"
+        resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5")
+        '
+        'RepositoryItemTrackBar1
+        '
+        Me.RepositoryItemTrackBar1.LabelAppearance.Options.UseTextOptions = True
+        Me.RepositoryItemTrackBar1.LabelAppearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center
+        Me.RepositoryItemTrackBar1.Maximum = 1
+        Me.RepositoryItemTrackBar1.Minimum = -1
+        Me.RepositoryItemTrackBar1.Name = "RepositoryItemTrackBar1"
+        Me.RepositoryItemTrackBar1.ShowLabels = True
+        '
+        'barItemGridFontSize
+        '
+        resources.ApplyResources(Me.barItemGridFontSize, "barItemGridFontSize")
+        Me.barItemGridFontSize.CaptionToEditorIndent = 0
+        Me.barItemGridFontSize.Edit = Me.cmbGridFontSize
+        Me.barItemGridFontSize.Id = 41
+        Me.barItemGridFontSize.Name = "barItemGridFontSize"
+        '
+        'cmbGridFontSize
+        '
+        resources.ApplyResources(Me.cmbGridFontSize, "cmbGridFontSize")
+        Me.cmbGridFontSize.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("cmbGridFontSize.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))})
+        Me.cmbGridFontSize.Name = "cmbGridFontSize"
+        '
        'frmMain
        '
        Me.Appearance.Options.UseFont = True
@@ -1437,6 +1472,8 @@ Partial Class frmMain
        CType(Me.RepositoryItemZoomTrackBar1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PrintPreviewRepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RepositoryItemTrackBar1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.cmbGridFontSize, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -1591,4 +1628,8 @@ Partial Class frmMain
    Friend WithEvents RibbonPageGroup8 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents BarButtonItemMassValidation As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarCheckItemShowSearch As DevExpress.XtraBars.BarCheckItem
+    Friend WithEvents barItemGridFontSize As DevExpress.XtraBars.BarEditItem
+    Friend WithEvents cmbGridFontSize As DevExpress.XtraEditors.Repository.RepositoryItemComboBox
+    Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RepositoryItemTrackBar1 As DevExpress.XtraEditors.Repository.RepositoryItemTrackBar
 End Class
--- a/app/DD_PM_WINDREAM/frmMain.resx
+++ b/app/DD_PM_WINDREAM/frmMain.resx
@@ -125,7 +125,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
-        CAAAAk1TRnQBSQFMAgEBAgEAAXQBCAF0AQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAXwBCAF8AQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -172,7 +172,60 @@
  <metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>179, 17</value>
  </metadata>
+  <data name="&gt;&gt;GridControl_Docs.Name" xml:space="preserve">
+    <value>GridControl_Docs</value>
+  </data>
+  <data name="&gt;&gt;GridControl_Docs.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;GridControl_Docs.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="&gt;&gt;GridControl_Docs.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;NavBarControl1.Name" xml:space="preserve">
+    <value>NavBarControl1</value>
+  </data>
+  <data name="&gt;&gt;NavBarControl1.Type" xml:space="preserve">
+    <value>DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;NavBarControl1.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="&gt;&gt;NavBarControl1.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="Panel1.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 9pt</value>
+  </data>
+  <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 151</value>
+  </data>
+  <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1233, 355</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;Panel1.Name" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="&gt;&gt;Panel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Panel1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
  <data name="GridControl_Docs.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
    <value>Zoom</value>
  </data>
@@ -200,7 +253,6 @@
  <data name="GridControl_Docs.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
    <value>Application</value>
  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="GridControl_Docs.Location" type="System.Drawing.Point, System.Drawing">
    <value>233, 0</value>
  </data>
@@ -210,7 +262,6 @@
  <data name="GridControl_Docs.Size" type="System.Drawing.Size, System.Drawing">
    <value>1000, 355</value>
  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="GridControl_Docs.TabIndex" type="System.Int32, mscorlib">
    <value>8</value>
  </data>
@@ -284,12 +335,6 @@
  <metadata name="cmsNavPane.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1012, 17</value>
  </metadata>
-  <data name="tsmiValidationProfil.Size" type="System.Drawing.Size, System.Drawing">
-    <value>219, 26</value>
-  </data>
-  <data name="tsmiValidationProfil.Text" xml:space="preserve">
-    <value>Starte Validierung für Profil</value>
-  </data>
  <data name="cmsNavPane.Size" type="System.Drawing.Size, System.Drawing">
    <value>220, 30</value>
  </data>
@@ -443,32 +488,11 @@
  <data name="&gt;&gt;NavBarControl1.ZOrder" xml:space="preserve">
    <value>1</value>
  </data>
-  <data name="Panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
+  <data name="tsmiValidationProfil.Size" type="System.Drawing.Size, System.Drawing">
+    <value>219, 26</value>
  </data>
-  <data name="Panel1.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 9pt</value>
-  </data>
-  <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 151</value>
-  </data>
-  <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1233, 355</value>
-  </data>
-  <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
-  </data>
-  <data name="&gt;&gt;Panel1.Name" xml:space="preserve">
-    <value>Panel1</value>
-  </data>
-  <data name="&gt;&gt;Panel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Panel1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
-    <value>2</value>
+  <data name="tsmiValidationProfil.Text" xml:space="preserve">
+    <value>Starte Validierung für Profil</value>
  </data>
  <metadata name="bindsourcegrid.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>171, 56</value>
@@ -479,27 +503,6 @@
  <metadata name="ContextMenuNotifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>404, 56</value>
  </metadata>
-  <data name="PopupErinnerungInaktivierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>234, 22</value>
-  </data>
-  <data name="PopupErinnerungInaktivierenToolStripMenuItem.Text" xml:space="preserve">
-    <value>Popup Erinnerung inaktivieren</value>
-  </data>
-  <data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>231, 6</value>
-  </data>
-  <data name="AnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>234, 22</value>
-  </data>
-  <data name="AnzeigenToolStripMenuItem.Text" xml:space="preserve">
-    <value>Bring to Front</value>
-  </data>
-  <data name="OutOfRangePMFixierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>234, 22</value>
-  </data>
-  <data name="OutOfRangePMFixierenToolStripMenuItem.Text" xml:space="preserve">
-    <value>Out of Range - PM fixieren</value>
-  </data>
  <data name="ContextMenuNotifyIcon.Size" type="System.Drawing.Size, System.Drawing">
    <value>235, 76</value>
  </data>
@@ -681,6 +684,27 @@
  <data name="NotifyIcon1.Visible" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
+  <data name="PopupErinnerungInaktivierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>234, 22</value>
+  </data>
+  <data name="PopupErinnerungInaktivierenToolStripMenuItem.Text" xml:space="preserve">
+    <value>Popup Erinnerung inaktivieren</value>
+  </data>
+  <data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>231, 6</value>
+  </data>
+  <data name="AnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>234, 22</value>
+  </data>
+  <data name="AnzeigenToolStripMenuItem.Text" xml:space="preserve">
+    <value>Bring to Front</value>
+  </data>
+  <data name="OutOfRangePMFixierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>234, 22</value>
+  </data>
+  <data name="OutOfRangePMFixierenToolStripMenuItem.Text" xml:space="preserve">
+    <value>Out of Range - PM fixieren</value>
+  </data>
  <metadata name="TimerRefresh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>605, 17</value>
  </metadata>
@@ -1705,33 +1729,30 @@
        Cjwvc3ZnPgs=
 </value>
  </data>
+  <data name="barItemGridFontSize.Caption" xml:space="preserve">
+    <value>Schriftgröße</value>
+  </data>
+  <data name="cmbGridFontSize.AutoHeight" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="cmbGridFontSize.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
+    <value>Combo</value>
+  </data>
+  <data name="barItemGridFontSize.EditWidth" type="System.Int32, mscorlib">
+    <value>100</value>
+  </data>
  <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
-  <data name="RibbonPageGroup1.Text" xml:space="preserve">
-    <value>Allgemein</value>
-  </data>
-  <data name="RibbonPageGroup2.Text" xml:space="preserve">
-    <value>Auswertungen</value>
-  </data>
-  <data name="RibbonPageGroup3.Text" xml:space="preserve">
-    <value>Verwaltung</value>
-  </data>
-  <data name="RibbonPageGroupBasicConf.Text" xml:space="preserve">
-    <value>Grundeinstellungen</value>
-  </data>
-  <data name="RibbonPageGroup7.Text" xml:space="preserve">
-    <value>Workflow</value>
-  </data>
-  <data name="RibbonPageGroup4.Text" xml:space="preserve">
-    <value>Funktionen/App Start</value>
-  </data>
  <data name="RibbonPage1.Text" xml:space="preserve">
    <value>Start</value>
  </data>
  <data name="RibbonPageGroup6.Text" xml:space="preserve">
    <value>Funktionen</value>
  </data>
+  <data name="RibbonPageGroup5.Text" xml:space="preserve">
+    <value>Workflow Tabelle</value>
+  </data>
  <data name="RibbonPage3.Text" xml:space="preserve">
    <value>Tabelle</value>
  </data>
@@ -1771,6 +1792,24 @@
  <data name="&gt;&gt;RibbonControl1.ZOrder" xml:space="preserve">
    <value>4</value>
  </data>
+  <data name="RibbonPageGroup1.Text" xml:space="preserve">
+    <value>Allgemein</value>
+  </data>
+  <data name="RibbonPageGroup2.Text" xml:space="preserve">
+    <value>Auswertungen</value>
+  </data>
+  <data name="RibbonPageGroup3.Text" xml:space="preserve">
+    <value>Verwaltung</value>
+  </data>
+  <data name="RibbonPageGroupBasicConf.Text" xml:space="preserve">
+    <value>Grundeinstellungen</value>
+  </data>
+  <data name="RibbonPageGroup7.Text" xml:space="preserve">
+    <value>Workflow</value>
+  </data>
+  <data name="RibbonPageGroup4.Text" xml:space="preserve">
+    <value>Funktionen/App Start</value>
+  </data>
  <data name="barDockControlTop.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Top</value>
  </data>
@@ -2867,6 +2906,30 @@
  <data name="&gt;&gt;TimerInactivity.Type" xml:space="preserve">
    <value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="&gt;&gt;RibbonPageGroup5.Name" xml:space="preserve">
+    <value>RibbonPageGroup5</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroup5.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RepositoryItemTrackBar1.Name" xml:space="preserve">
+    <value>RepositoryItemTrackBar1</value>
+  </data>
+  <data name="&gt;&gt;RepositoryItemTrackBar1.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.Repository.RepositoryItemTrackBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;barItemGridFontSize.Name" xml:space="preserve">
+    <value>barItemGridFontSize</value>
+  </data>
+  <data name="&gt;&gt;barItemGridFontSize.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarEditItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;cmbGridFontSize.Name" xml:space="preserve">
+    <value>cmbGridFontSize</value>
+  </data>
+  <data name="&gt;&gt;cmbGridFontSize.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmMain</value>
  </data>
@@ -3078,6 +3141,9 @@
  <data name="miView.Caption" xml:space="preserve">
    <value>&amp;Ansicht</value>
  </data>
+  <data name="miBackground.Caption" xml:space="preserve">
+    <value>&amp;Hintergrund</value>
+  </data>
  <data name="miPageLayout.Caption" xml:space="preserve">
    <value>&amp;Seiten Layout</value>
  </data>
@@ -3090,9 +3156,6 @@
  <data name="miToolbars.Caption" xml:space="preserve">
    <value>Bars</value>
  </data>
-  <data name="miBackground.Caption" xml:space="preserve">
-    <value>&amp;Hintergrund</value>
-  </data>
  <data name="PrintPreviewBarCheckItem1.Caption" xml:space="preserve">
    <value>PDF Dokument</value>
  </data>
--- a/app/DD_PM_WINDREAM/frmMain.vb
+++ b/app/DD_PM_WINDREAM/frmMain.vb
@@ -143,6 +143,17 @@ Public Class frmMain
        GridBuilder = New GridBuilder(GridViewWFItems)
        GridBuilder.WithFontSizeDelta(CONFIG.Config.GridFontSizeDelta)

+        Dim oFontSettings = New List(Of FontSetting) From {
+            New FontSetting With {.Title = "Kleiner", .Value = -2},
+            New FontSetting With {.Title = "Normal", .Value = 0},
+            New FontSetting With {.Title = "Größer", .Value = 2}
+        }
+
+        cmbGridFontSize.Items.Clear()
+        cmbGridFontSize.Items.AddRange(oFontSettings)
+        barItemGridFontSize.EditValue = oFontSettings.
+                Where(Function(item) item.Value = CONFIG.Config.GridFontSizeDelta).
+                FirstOrDefault()

        ' Create helper to save/load expanded GroupColumns at runtime
        RefreshHelper = New RefreshHelper(LOGCONFIG, GridViewWFItems, "GUID")
@@ -374,6 +385,16 @@ Public Class frmMain

        FormOpenClose = False
    End Sub
+
+    Public Class FontSetting
+        Public Property Title As String
+        Public Property Value As Integer
+
+        Public Overrides Function ToString() As String
+            Return Title
+        End Function
+    End Class
+
    Sub Check_Timer_Notification()
        Try
            If CONFIG.Config.ReminderTimer <> 0 Then
@@ -578,7 +599,9 @@ Public Class frmMain

                If IDB_ACTIVE = True Then
                    Try
-                        GridViewWFItems.Columns.Item("CONV_YN").Visible = False
+                        If GridViewWFItems.Columns.Item("CONV_YN") IsNot Nothing Then
+                            GridViewWFItems.Columns.Item("CONV_YN").Visible = False
+                        End If
                    Catch ex As Exception
                        LOGGER.Info("ResetLayout - Check wether Column CONV_YN is part of select/view..now checking CONVERSATION")
                    End Try
@@ -1826,7 +1849,10 @@ Public Class frmMain
                    End If

                    Try
-                        GridViewWFItems.Columns.Item("CONV_YN").Visible = False
+                        If GridViewWFItems.Columns.Item("CONV_YN") IsNot Nothing Then
+                            GridViewWFItems.Columns.Item("CONV_YN").Visible = False
+
+                        End If
                    Catch ex As Exception
                        LOGGER.Info("LoadGridOverview - Check wether Column CONV_YN is part of select/view")
                    End Try
@@ -2109,7 +2135,7 @@ Public Class frmMain
                BASEDATA_DT_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Clone()
            End If
            If pMode = "bwBasicData" Then bwBasicData.ReportProgress(50)
-            oSQL = "select * from TBPM_PROFILE_SEARCH where TYPE = 'DOC' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX"
+            oSQL = "select * from TBPM_PROFILE_SEARCH where TYPE = 'SQL' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX"
            'BASEDATA_DT_PROFILES_SEARCHES_SQL = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_SEARCH", "TYPE = 'SQL'", "PROFILE_ID,TAB_INDEX")
            BASEDATA_DT_PROFILES_SEARCHES_SQL = DatabaseFallback.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
                .FilterExpression = "TYPE = 'SQL'",
@@ -2260,7 +2286,6 @@ Public Class frmMain
            frmKonfig.ShowDialog()

            '  Load_Profil()
-            GridBuilder.WithFontSizeDelta(CONFIG.Config.GridFontSizeDelta)
            Check_Timer_Notification()
        Catch ex As Exception
            LOGGER.Error(ex)
@@ -2798,5 +2823,12 @@ Public Class frmMain
        End If
    End Sub

-
+    Private Sub barItemGridFontSize_EditValueChanged(sender As Object, e As EventArgs) Handles barItemGridFontSize.EditValueChanged
+        Try
+            CONFIG.Config.GridFontSizeDelta = DirectCast(barItemGridFontSize.EditValue, FontSetting).Value
+            CONFIG.Save()
+            GridBuilder.WithFontSizeDelta(CONFIG.Config.GridFontSizeDelta)
+        Catch ex As Exception
+        End Try
+    End Sub
 End Class
--- a/app/DD_PM_WINDREAM/frmValidator.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.vb
@@ -473,112 +473,135 @@ Public Class frmValidator
            LOGGER.Error(ex)
        End Try
    End Sub
+
+    Public Function Test_Additional_Data_Searches_Exist() As Boolean
+        If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
+            Dim oDataResultCommand As String
+            Dim oDatatableDataResult As DataTable = Nothing
+
+            If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
+                'Check whether DocData is there
+                Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID")
+                oDataResultCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND")
+                oDataResultCommand = clsPatterns.ReplaceAllValues(oDataResultCommand, PanelValidatorControl, True)
+                'oDatatableDataResult = ClassDatabase.Return_Datatable_ConId(oDataResultCommand, oConID, "Load_Additional_Searches1")
+                oDatatableDataResult = DatabaseFallback.GetDatatable(New GetDatatableOptions(oDataResultCommand, DatabaseType.ECM) With {
+                    .ConnectionId = oConID
+                })
+            End If
+
+            Dim oDataResultsExist As Boolean = False
+
+            If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
+                If Not IsNothing(oDatatableDataResult) Then
+                    If oDatatableDataResult.Rows.Count > 0 Then
+                        oDataResultsExist = True
+                    End If
+                End If
+
+            End If
+
+            Return oDataResultsExist
+        Else
+            Return False
+        End If
+    End Function
+    Public Function Test_Additional_Doc_Searches_Exist() As Boolean
+        If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
+            Dim oDocResultCommand As String
+            Dim oDatatableDocResult As DataTable = Nothing
+
+            If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
+                'Check whether DocData is there
+                Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID")
+                oDocResultCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND")
+                oDocResultCommand = clsPatterns.ReplaceAllValues(oDocResultCommand, PanelValidatorControl, True)
+                'oDatatableDocResult = ClassDatabase.Return_Datatable_ConId(oDocResultCommand, oConID, "Load_Additional_Searches2")
+                oDatatableDocResult = DatabaseFallback.GetDatatable(New GetDatatableOptions(oDocResultCommand, DatabaseType.ECM) With {
+                    .ConnectionId = oConID
+                })
+            End If
+
+            Dim oDocResultsExist As Boolean = False
+
+            If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
+                If Not IsNothing(oDatatableDocResult) Then
+                    If oDatatableDocResult.Rows.Count > 0 Then
+                        oDocResultsExist = True
+                        DT_AdditionalSearches_Resultset_Docs = oDatatableDocResult
+                    End If
+                End If
+            End If
+
+            Return oDocResultsExist
+        Else
+            Return False
+        End If
+    End Function
+
    Public Sub Load_Additional_Searches()
        Try
-            If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Or BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
-                Dim oDocResultCommand As String
-                Dim oDatatableDocResult As DataTable
-                Dim oDataResultCommand As String
-                Dim oDatatableDataResult As DataTable
-                If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
-                    'Check whether DocData is there
-                    Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID")
-                    oDataResultCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND")
-                    oDataResultCommand = clsPatterns.ReplaceAllValues(oDataResultCommand, PanelValidatorControl, True)
-                    'oDatatableDataResult = ClassDatabase.Return_Datatable_ConId(oDataResultCommand, oConID, "Load_Additional_Searches1")
-                    oDatatableDataResult = DatabaseFallback.GetDatatable(New GetDatatableOptions(oDataResultCommand, DatabaseType.ECM) With {
-                        .ConnectionId = oConID
-                    })
-                End If
-                If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
-                    'Check whether DocData is there
-                    Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID")
-                    oDocResultCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND")
-                    oDocResultCommand = clsPatterns.ReplaceAllValues(oDocResultCommand, PanelValidatorControl, True)
-                    'oDatatableDocResult = ClassDatabase.Return_Datatable_ConId(oDocResultCommand, oConID, "Load_Additional_Searches2")
-                    oDatatableDocResult = DatabaseFallback.GetDatatable(New GetDatatableOptions(oDocResultCommand, DatabaseType.ECM) With {
-                        .ConnectionId = oConID
-                    })
-                End If
+            Dim oDocResultsExist = Test_Additional_Doc_Searches_Exist()
+            Dim oDataResultsExist = Test_Additional_Data_Searches_Exist()

-                Dim oDataResultsExist As Boolean = False
-                Dim oDocResultsExist As Boolean = False
+            'If Test_Additional_Searches_Exist() Then
+            If oDataResultsExist = True Or oDocResultsExist = True Then
+                'If RibbonPageCustItm1 <> "" Then
+                '    BarButtonItemAttmt.Caption = RibbonPageCustItm1
+                '    BarButtonItemAttmt.Visibility = BarItemVisibility.Always
+                '    Dim toggleLink As BarToggleSwitchItem = TryCast(ToggleSwitchItemLoadonClick, BarToggleSwitchItem)
+                '    toggleLink.Checked = CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK
+                '    ToggleSwitchItemLoadonClick.Visibility = BarItemVisibility.Always
+                'End If
+                Try
+                    'If CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK = False Then
+                    '_frmValidatorSearch.Show()
+                    'End If

-                If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
-                    If Not IsNothing(oDatatableDataResult) Then
-                        If oDatatableDataResult.Rows.Count > 0 Then
-                            oDataResultsExist = True
-                        End If
+                    Dim oPnl1Collapsed As Boolean = True
+                    Dim oPnl2Collapsed As Boolean = True
+                    If oDataResultsExist = True Then
+                        oPnl1Collapsed = False
+                    Else
+                        oPnl1Collapsed = True
                    End If
-
-                End If
-                If BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
-                    If Not IsNothing(oDatatableDocResult) Then
-                        If oDatatableDocResult.Rows.Count > 0 Then
-                            oDocResultsExist = True
-                            DT_AdditionalSearches_Resultset_Docs = oDatatableDocResult
-                        End If
+                    If oDocResultsExist = True Then
+                        oPnl2Collapsed = False
+                    Else
+                        oPnl2Collapsed = True
                    End If
-                End If
+                    _frmValidatorSearch.TabPreload(oPnl1Collapsed, oPnl2Collapsed, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count,
+                        BASEDATA_DT_PROFILE_SEARCHES_SQL, BASEDATA_DT_PROFILE_SEARCHES_DOC)
+                    If oDataResultsExist Then
+                        _frmValidatorSearch._DTSQLSearches = BASEDATA_DT_PROFILE_SEARCHES_SQL
+                        Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID")
+                        Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND")
+                        oCommand = clsPatterns.ReplaceAllValues(oCommand, PanelValidatorControl, True)

-
-
-                If oDataResultsExist = True Or oDocResultsExist = True Then
-                    bbtniRefreshSearches.Visibility = BarItemVisibility.Always
-
-                    If RibbonPageCustItm1 <> "" Then
-                        BarButtonItemAttmt.Caption = RibbonPageCustItm1
-                        BarButtonItemAttmt.Visibility = BarItemVisibility.Always
-                        Dim toggleLink As BarToggleSwitchItem = TryCast(ToggleSwitchItemLoadonClick, BarToggleSwitchItem)
-                        toggleLink.Checked = CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK
-                        ToggleSwitchItemLoadonClick.Visibility = BarItemVisibility.Always
+                        _frmValidatorSearch.Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE"))
                    End If
-                    Try
-                        If CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK = False Then
-                            _frmValidatorSearch.Show()
-                        End If
+                    If oDocResultsExist Then
+                        _frmValidatorSearch._DTDocSearches = BASEDATA_DT_PROFILE_SEARCHES_DOC
+                        Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID")
+                        Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND")
+                        oCommand = clsPatterns.ReplaceAllValues(oCommand, PanelValidatorControl, True)

-                        Dim oPnl1Collapsed As Boolean = True
-                        Dim oPnl2Collapsed As Boolean = True
-                        If oDataResultsExist = True Then
-                            oPnl1Collapsed = False
-                        Else
-                            oPnl1Collapsed = True
-                        End If
-                        If oDocResultsExist = True Then
-                            oPnl2Collapsed = False
-                        Else
-                            oPnl2Collapsed = True
-                        End If
-                        _frmValidatorSearch.TabPreload(oPnl1Collapsed, oPnl2Collapsed, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows.Count,
-                            BASEDATA_DT_PROFILE_SEARCHES_SQL, BASEDATA_DT_PROFILE_SEARCHES_DOC)
-                        If oDataResultsExist Then
-                            _frmValidatorSearch._DTSQLSearches = BASEDATA_DT_PROFILE_SEARCHES_SQL
-                            Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID")
-                            Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND")
-                            oCommand = clsPatterns.ReplaceAllValues(oCommand, PanelValidatorControl, True)
+                        _frmValidatorSearch.RefreshTabDoc(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE"))
+                    End If
+                Catch ex As Exception
+                    LOGGER.Error(ex)
+                End Try

-                            _frmValidatorSearch.Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE"))
-                        End If
-                        If oDocResultsExist Then
-                            _frmValidatorSearch._DTDocSearches = BASEDATA_DT_PROFILE_SEARCHES_DOC
-                            Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID")
-                            Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND")
-                            oCommand = clsPatterns.ReplaceAllValues(oCommand, PanelValidatorControl, True)
-
-                            _frmValidatorSearch.RefreshTabDoc(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE"))
-                        End If
-                    Catch ex As Exception
-                        LOGGER.Error(ex)
-                    End Try
-                Else
-                    LOGGER.Debug("Not loading AdditionalSearches 1...!")
-                    bbtniRefreshSearches.Visibility = BarItemVisibility.Never
-                End If
+                bbtniRefreshSearches.Visibility = BarItemVisibility.Always
            Else
-                LOGGER.Debug("Not loading AdditionalSearches 2...!")
                bbtniRefreshSearches.Visibility = BarItemVisibility.Never
+                LOGGER.Debug("Not loading AdditionalSearches 1...!")
            End If
+
+            'Else
+            '    LOGGER.Debug("Not loading AdditionalSearches 2...!")
+            '    bbtniRefreshSearches.Visibility = BarItemVisibility.Never
+            'End If
        Catch ex As Exception
            MsgBox(ex.Message, MsgBoxStyle.Critical, ADDITIONAL_TITLE)
        End Try
@@ -3600,11 +3623,27 @@ Public Class frmValidator
                    RibbonPageGroup2.Visible = False
                End If

-
-
                'Flag setzen das Indexe geladen sind
                _Indexe_Loaded = True
-                Load_Additional_Searches()
+
+                ' Should the custom Ribbon group be displayed at all?
+                ' Will be hidden later if not search results are found
+                If RibbonPageCustItm1 <> "" Then
+                    BarButtonItemAttmt.Caption = RibbonPageCustItm1
+                    BarButtonItemAttmt.Visibility = BarItemVisibility.Always
+                    Dim toggleLink As BarToggleSwitchItem = TryCast(ToggleSwitchItemLoadonClick, BarToggleSwitchItem)
+                    toggleLink.Checked = CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK
+                    ToggleSwitchItemLoadonClick.Visibility = BarItemVisibility.Always
+                Else
+                    BarButtonItemAttmt.Visibility = BarItemVisibility.Never
+                    ToggleSwitchItemLoadonClick.Visibility = BarItemVisibility.Never
+                End If
+
+                ' If Searches should be loaded automatically, not only on click
+                If CONFIG.Config.ADDITIONAL_SEARCHES_LOAD_ONCLICK = False Then
+                    _frmValidatorSearch?.Show()
+                    Load_Additional_Searches()
+                End If
            Else
                MsgBox("Für dieses Profil wurde noch keine Eingabemaske definiert!" & vbNewLine & "Informieren Sie Ihren PM-Administrator!" & vbNewLine & "Das Fenster wird geschlossen!", MsgBoxStyle.Exclamation, "Achtung:")
                Me.Close()
@@ -5470,6 +5509,7 @@ Public Class frmValidator
        Try
            _frmValidatorSearch?.Close()
            _frmValidatorSearch = New frmValidatorSearch
+            _frmValidatorSearch.Show()
        Catch ex As Exception
            LOGGER.Error(ex)
        End Try
Author	SHA1	Message	Date
Jonathan Jenne	61ca23373a	Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ProcessManager	2022-04-06 14:47:43 +02:00
Jonathan Jenne	03152a6d5f	Fix Additional search ui, fix fallback sql for data searches	2022-04-06 14:47:14 +02:00
Jonathan Jenne	89dd39b081	Move Grid Fontsizedelta to frmMain	2022-04-06 12:07:50 +02:00