From cc6d573c1bb8327999115ddf254cd35752aa0395 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Thu, 21 Jan 2021 17:05:03 +0100 Subject: [PATCH 1/2] MS Globix FlowSearch --- .../Globix/frmGlobix_Index.Designer.vb | 20 +++++++++++++------ GUIs.ZooFlow/Search/frmFlowSearch.vb | 10 +++++----- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb b/GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb index 911e798b..d4a8576d 100644 --- a/GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb +++ b/GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb @@ -254,10 +254,13 @@ Partial Class frmGlobix_Index ' 'pnlIndex ' + Me.pnlIndex.BackColor = System.Drawing.Color.DimGray Me.pnlIndex.Dock = System.Windows.Forms.DockStyle.Fill - Me.pnlIndex.Location = New System.Drawing.Point(0, 50) + Me.pnlIndex.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.pnlIndex.ForeColor = System.Drawing.Color.White + Me.pnlIndex.Location = New System.Drawing.Point(0, 58) Me.pnlIndex.Name = "pnlIndex" - Me.pnlIndex.Size = New System.Drawing.Size(591, 383) + Me.pnlIndex.Size = New System.Drawing.Size(591, 375) Me.pnlIndex.TabIndex = 3 ' 'Panel3 @@ -276,7 +279,9 @@ Partial Class frmGlobix_Index Me.PictureEdit1.Location = New System.Drawing.Point(0, 0) Me.PictureEdit1.MenuManager = Me.RibbonControl1 Me.PictureEdit1.Name = "PictureEdit1" - Me.PictureEdit1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Office2003 + Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.Color.DimGray + Me.PictureEdit1.Properties.Appearance.Options.UseBackColor = True + Me.PictureEdit1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Flat Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] Me.PictureEdit1.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom Me.PictureEdit1.Size = New System.Drawing.Size(591, 75) @@ -284,21 +289,24 @@ Partial Class frmGlobix_Index ' 'Panel1 ' + Me.Panel1.BackColor = System.Drawing.Color.DimGray Me.Panel1.Controls.Add(Me.Label1) Me.Panel1.Controls.Add(Me.cmbDoctype) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(591, 50) + Me.Panel1.Size = New System.Drawing.Size(591, 58) Me.Panel1.TabIndex = 0 ' 'Label1 ' Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label1.ForeColor = System.Drawing.Color.White Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.Label1.Location = New System.Drawing.Point(3, 3) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(192, 13) + Me.Label1.Size = New System.Drawing.Size(212, 17) Me.Label1.TabIndex = 2 Me.Label1.Text = "Bitte wählen Sie einen Ablage-Flow:" ' @@ -308,7 +316,7 @@ Partial Class frmGlobix_Index Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.cmbDoctype.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cmbDoctype.FormattingEnabled = True - Me.cmbDoctype.Location = New System.Drawing.Point(6, 19) + Me.cmbDoctype.Location = New System.Drawing.Point(6, 27) Me.cmbDoctype.Name = "cmbDoctype" Me.cmbDoctype.Size = New System.Drawing.Size(555, 25) Me.cmbDoctype.TabIndex = 0 diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.vb b/GUIs.ZooFlow/Search/frmFlowSearch.vb index 276a6cde..2a6ccf98 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch.vb @@ -13,6 +13,7 @@ Public Class frmFlowSearch Dim oAttributeCount As Integer = 1 Dim BASE_SEARCHCommand As String Private LastSearchForm As frmDocumentResultList + Private ASorDB As ClassDataASorDB Public Sub New(pBaseSearchSql As String) @@ -21,6 +22,7 @@ Public Class frmFlowSearch BASE_SEARCHCommand = pBaseSearchSql ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. Logger = My.LogConfig.GetLogger() + ASorDB = New ClassDataASorDB(My.LogConfig) End Sub Private Sub txtSearch_TextChanged(sender As Object, e As EventArgs) Handles txtSearch.TextChanged @@ -273,8 +275,9 @@ Public Class frmFlowSearch Dim oSplit = oItem.Tag.ToString.Split("|") Try oHandle = SplashScreenManager.ShowOverlayForm(Me) - - Dim oEXECSQL = $"EXEC PRFLOW_SEARCH_GET_RESULT_PER_TILE '{oSplit(0)}',{My.Application.User.UserId},'{oSearchData.SelectInStringAttributeIds}','{oSearchData.SelectInIntegerAttributeIds}'" + Dim oDT As DataTable = ASorDB.GetDatatable("IDB", $"SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE ATTR_ID = {oSplit(1)}", "VWIDB_BE_ATTRIBUTE", $"ATTR_ID = {oSplit(1)}") + Dim oType = oDT.Rows(0).Item("TYPE_NAME") + Dim oEXECSQL = $"EXEC PRFLOW_SEARCH_GET_RESULT_PER_TILE {oSplit(0)},{My.Application.User.UserId},'{oType}',{oSplit(1)},'{My.Application.User.Language}'" Dim oDTOBJECT_RESULT As DataTable = My.DatabaseIDB.GetDatatable(oEXECSQL) If Not IsNothing(oDTOBJECT_RESULT) Then oItemsFound = True @@ -288,9 +291,6 @@ Public Class frmFlowSearch SplashScreenManager.CloseOverlayForm(oHandle) End Try - Return oItemsFound - - Catch ex As Exception MsgBox($"Error while loading Searches: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, Text) Logger.Error(ex) From ac074fa2eaeba4cf436ff284f74b8cc128c04962 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Thu, 28 Jan 2021 08:30:08 +0100 Subject: [PATCH 2/2] ms DocumentReultlist --- GUIs.Common/DocumentResultList/frmDocumentResultList.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index 4632a7a7..801af409 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -392,7 +392,7 @@ Public Class frmDocumentResultList If OperationMode = IResultForm.Mode.WithAppServer Then ' Hide Fullpath completely in AppServer Mode GridView.Columns.Item(COLUMN_FILEPATH).OptionsColumn.ShowInCustomizationForm = False - GridView.Columns.Item(COLUMN_ICON).Visible = False + 'GridView.Columns.Item(COLUMN_ICON).Visible = False GridView.Columns.Item(COLUMN_FILEPATH).Visible = False End If