From 7b9f6796642e24d461c43b0ca87323c80fe60266 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 11 Apr 2022 15:25:32 +0200 Subject: [PATCH 1/4] Zooflow: Improve Search Form code --- GUIs.ZooFlow/ClassInit.vb | 2 +- GUIs.ZooFlow/Search/SearchRunner.vb | 190 +++++++ .../Search/frmFlowSearch1.Designer.vb | 34 +- GUIs.ZooFlow/Search/frmFlowSearch1.vb | 527 ++++++++++-------- GUIs.ZooFlow/ZooFlow.vbproj | 1 + 5 files changed, 507 insertions(+), 247 deletions(-) create mode 100644 GUIs.ZooFlow/Search/SearchRunner.vb diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index 44b32bf6..b458d04f 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -146,7 +146,7 @@ Public Class ClassInit My.Database = New DatabaseWithFallback(LogConfig, My.Application.Service.Client, My.DatabaseECM, My.DatabaseIDB) Catch ex As Exception Logger.Error(ex) - Throw New InitException("Error InitializeDatabaseWithFallback!", ex) + Throw New InitException("Error in InitializeDatabaseWithFallback!", ex) End Try End Sub Private Sub InitializeUser(MyApplication As My.MyApplication) diff --git a/GUIs.ZooFlow/Search/SearchRunner.vb b/GUIs.ZooFlow/Search/SearchRunner.vb new file mode 100644 index 00000000..a7b353c6 --- /dev/null +++ b/GUIs.ZooFlow/Search/SearchRunner.vb @@ -0,0 +1,190 @@ +Imports DigitalData.GUIs.Common +Imports DigitalData.Modules.Base +Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.ZooFlow + +Public Class SearchRunner + Inherits BaseClass + + Private Const SEARCH_FACT_DATE_DEFAULT As String = "ADDED_WHEN" + + Private Environment As Environment + + Private Const CREATED_TOMORROW As String = "TOMORROW" + Private Const CREATED_TODAY As String = "ECM_CREATED_TODAY" + Private Const CREATED_YESTERDAY As String = "ECM_CREATED_YESTERDAY" + Private Const CREATED_LAST_7_DAYS As String = "ECM_CREATED_LAST7DAYS" + Private Const CREATED_YEAR_CURRENT As String = "ECM_CREATED_YEAR_CURRENT" + Private Const CREATED_YEAR_LAST As String = "ECM_CREATED_YEAR_LAST" + Private Const CREATED_MONTH_CURR As String = "ECM_CREATED_MONTH_CURRENT" + Private Const CREATED_MONTH_LAST As String = "ECM_CREATED_MONTH_LAST" + + Public Enum DateConstraint + Today + Tomorrow + Yesterday + Last7Days + CurrentMonth + LastMonth + CurrentYear + LastYear + End Enum + + Public Event NeedsRefresh As EventHandler(Of Integer) + + Private _ActiveDateConstraint As String = CREATED_TODAY + Public ReadOnly Property ActiveDateConstraint As String + Get + Return _ActiveDateConstraint + End Get + End Property + + Private _ActiveDateAttribute As String = SEARCH_FACT_DATE_DEFAULT + Public ReadOnly Property ActiveDateAttribute As String + Get + Return _ActiveDateAttribute + End Get + End Property + + Public Property BaseSearchSQL As String + Public Property ExplicitDate As Boolean = False + + Public Sub New(pLogConfig As LogConfig, pEnvironment As Environment) + MyBase.New(pLogConfig) + Environment = pEnvironment + End Sub + + Public Async Function Run(pSearchTerm As String, pDateFrom As Date, pDateTo As Date) As Threading.Tasks.Task(Of SearchResult) + Dim oSearchTerm = pSearchTerm + Dim oParams = New DocumentResultList.Params() With { + .WindowGuid = "FlowSearch", + .WindowTitle = GetResultWindowString(oSearchTerm), + .OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow, + .ProfileGuid = 354522, + .ColumnNames = New DocumentResultList.ColumnNames With { + .ObjectIdColumn = "DocID" + } + } + + Dim oP3 = $"{_ActiveDateAttribute}~{_ActiveDateConstraint}" + + If ExplicitDate Then + Dim oDate2 As Date + If pDateTo.Equals(Date.MinValue) Then + oDate2 = pDateTo + Else + oDate2 = pDateFrom + End If + Dim oProc = $"EXEC PRIDB_SEARCH_ADD_USR_DATE {My.Application.User.UserId},'{pDateFrom}','{oDate2}'" + If Await My.Database.ExecuteNonQueryIDBAsync(oProc) = True Then + oP3 = $"{_ActiveDateAttribute}~DATEPART" + End If + End If + + Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oP3}'" + + If Await My.Database.ExecuteNonQueryIDBAsync(oSQL) = True Then + Dim oDTDocResult = Await My.Database.GetDatatableIDBAsync(BaseSearchSQL) + If oDTDocResult.Rows.Count > 0 Then + oParams.Results.Add(New DocumentResultList.DocumentResult() With { + .Title = "FlowSearchXYZ", + .Datatable = oDTDocResult + }) + Dim oForm As New frmDocumentResultList(My.LogConfig, Environment, oParams) + + ' TODO: Implement, not needed right now + 'AddHandler oForm.NeedsRefresh, AddressOf Form_NeedsRefresh + + oForm.Show() + + Return New SearchResult With { + .OK = True + } + Else + 'bsiStatus.Caption = "No Results" + Return New SearchResult With { + .OK = False, + .ErrorMessage = "No Results" + } + End If + Else + 'bsiStatus.Caption = "Error in FlowSearch - Check Your log" + Return New SearchResult With { + .OK = False, + .ErrorMessage = "Error in FlowSearch - Check Your log" + } + End If + End Function + + + + Private Function GetResultWindowString(SearchContent As String) As String + If SearchContent <> String.Empty Then + If My.Application.User.Language = State.UserState.LANG_DE_DE Then + + Return $"Suche Nach '{SearchContent}'" + Else + Return $"Search For '{SearchContent}'" + End If + Else + If My.Application.User.Language = State.UserState.LANG_DE_DE Then + Return $"Suche Datumsbegrenzt" + Else + Return $"Search via date" + End If + End If + End Function + + Public Sub SetDateConstraint() + _ActiveDateConstraint = String.Empty + End Sub + + Public Sub SetDateConstraint(pConstraintName As String) + _ActiveDateConstraint = pConstraintName + End Sub + + Public Sub SetDateConstraint(pConstraint As DateConstraint) + Select Case pConstraint + Case DateConstraint.Today + _ActiveDateConstraint = CREATED_TODAY + + Case DateConstraint.Yesterday + _ActiveDateConstraint = CREATED_YESTERDAY + + Case DateConstraint.Tomorrow + _ActiveDateConstraint = CREATED_TOMORROW + + Case DateConstraint.Last7Days + _ActiveDateConstraint = CREATED_LAST_7_DAYS + + Case DateConstraint.CurrentMonth + _ActiveDateConstraint = CREATED_MONTH_CURR + + Case DateConstraint.LastMonth + _ActiveDateConstraint = CREATED_MONTH_LAST + + Case DateConstraint.CurrentYear + _ActiveDateConstraint = CREATED_YEAR_CURRENT + + Case DateConstraint.LastYear + _ActiveDateConstraint = CREATED_YEAR_LAST + + Case Else + _ActiveDateAttribute = String.Empty + + End Select + End Sub + + Public Sub SetDateAttribute(pAttributeName As String) + _ActiveDateAttribute = pAttributeName + End Sub + + Public Sub SetDateAttribute() + _ActiveDateAttribute = SEARCH_FACT_DATE_DEFAULT + End Sub + + Public Class SearchResult + Public OK As Boolean + Public ErrorMessage As String + End Class +End Class diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb index 94ffb1d9..4648961f 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb @@ -25,8 +25,8 @@ Partial Class frmFlowSearch1 Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowSearch1)) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonStartSearch = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonReset = New DevExpress.XtraBars.BarButtonItem() Me.bsiStatus = New DevExpress.XtraBars.BarStaticItem() Me.BarSubItem1 = New DevExpress.XtraBars.BarSubItem() Me.BarListItem1 = New DevExpress.XtraBars.BarListItem() @@ -87,7 +87,7 @@ Partial Class frmFlowSearch1 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.bsiStatus, Me.BarSubItem1, Me.BarListItem1, Me.BarToggleSwitchItemTerm, Me.BarToggleSwitchItemFulltext}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonStartSearch, Me.BarButtonReset, Me.bsiStatus, Me.BarSubItem1, Me.BarListItem1, Me.BarToggleSwitchItemTerm, Me.BarToggleSwitchItemFulltext}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) Me.RibbonControl1.MaxItemId = 8 Me.RibbonControl1.Name = "RibbonControl1" @@ -96,19 +96,19 @@ Partial Class frmFlowSearch1 Me.RibbonControl1.Size = New System.Drawing.Size(936, 158) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' - 'BarButtonItem1 + 'BarButtonStartSearch ' - Me.BarButtonItem1.Caption = "Suche starten" - Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem1.Name = "BarButtonItem1" + Me.BarButtonStartSearch.Caption = "Suche starten" + Me.BarButtonStartSearch.Id = 1 + Me.BarButtonStartSearch.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonStartSearch.Name = "BarButtonStartSearch" ' - 'BarButtonItem2 + 'BarButtonReset ' - Me.BarButtonItem2.Caption = "Suche zurücksetzen" - Me.BarButtonItem2.Id = 2 - Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem2.Name = "BarButtonItem2" + Me.BarButtonReset.Caption = "Suche zurücksetzen" + Me.BarButtonReset.Id = 2 + Me.BarButtonReset.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonReset.Name = "BarButtonReset" ' 'bsiStatus ' @@ -152,8 +152,8 @@ Partial Class frmFlowSearch1 ' 'RibbonPageGroup2 ' - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1) - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonStartSearch) + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonReset) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Suchfunktionen" ' @@ -493,8 +493,8 @@ Partial Class frmFlowSearch1 Friend WithEvents ToggleSwitchTomorrow As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents ToggleSwitchMonth_Last As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents ToggleSwitchMonth As DevExpress.XtraEditors.ToggleSwitch - Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonStartSearch As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonReset As DevExpress.XtraBars.BarButtonItem Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl Friend WithEvents bsiStatus As DevExpress.XtraBars.BarStaticItem Friend WithEvents ToggleSwitchYear As DevExpress.XtraEditors.ToggleSwitch diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.vb index fad96c09..338a7913 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.vb @@ -6,53 +6,55 @@ Imports DigitalData.Modules.Logging Imports DigitalData.Modules.ZooFlow Public Class frmFlowSearch1 - Private _Environment As Environment + Private Environment As Environment Private Logger As Logger + Private SearchRunner As SearchRunner - Private TOGGLE_Change As Boolean = False - Private AttributeSearch As String = "ADDED_WHEN" - Private DateConstraint As String = "" - Private BaseSearchSQL As String + 'Private Property AttributeSearch As String = "ADDED_WHEN" + 'Private Property DateConstraint As String = "" 'Private LIMITATION_DATE As Boolean = False 'Private SEARCH_FACT_DATE As String = "MONTH(OBJ.ADDED_WHEN) <> 13" + 'Private Const SEARCH_FACT_DATE_DEFAULT As String = "ADDED_WHEN" + 'Private Const CREATED_TOMORROW As String = "TOMORROW" + 'Private Const CREATED_TODAY As String = "ECM_CREATED_TODAY" + 'Private Const CREATED_YESTERDAY As String = "ECM_CREATED_YESTERDAY" + 'Private Const CREATED_LAST_7_DAYS As String = "ECM_CREATED_LAST7DAYS" + 'Private Const CREATED_YEAR_CURRENT As String = "ECM_CREATED_YEAR_CURRENT" + 'Private Const CREATED_YEAR_LAST As String = "ECM_CREATED_YEAR_LAST" + 'Private Const CREATED_MONTH_CURR As String = "ECM_CREATED_MONTH_CURRENT" + 'Private Const CREATED_MONTH_LAST As String = "ECM_CREATED_MONTH_LAST" + 'Private Property ExplizitDate As Boolean = False + + Private Property BaseSearchSQL As String + Private Property TogglesDate As List(Of ToggleSwitch) + Private Property TogglesDateChanging As Boolean = False + + Private Sub ResetTogglesDate() + ResetTogglesDate(Nothing) + End Sub - Private Const SEARCH_FACT_DATE_DEFAULT As String = "ADDED_WHEN" - - Private Const CREATED_TOMORROW As String = "TOMORROW" - Private Const CREATED_TODAY As String = "ECM_CREATED_TODAY" - Private Const CREATED_YESTERDAY As String = "ECM_CREATED_YESTERDAY" - Private Const CREATED_LAST_7_DAYS As String = "ECM_CREATED_LAST7DAYS" - Private Const CREATED_YEAR_CURRENT As String = "ECM_CREATED_YEAR_CURRENT" - Private Const CREATED_YEAR_LAST As String = "ECM_CREATED_YEAR_LAST" - Private Const CREATED_MONTH_CURR As String = "ECM_CREATED_MONTH_CURRENT" - Private Const CREATED_MONTH_LAST As String = "ECM_CREATED_MONTH_LAST" - - - Private ExplizitDate As Boolean = False - - 'Private Enum DateConstraintEnum - ' Today - ' Yesterday - ' Last7Days - ' CurrentYear - ' LastYear - ' CurrentMonth - ' LastMonth - 'End Enum - + Private Sub ResetTogglesDate(pExcludeToggle As ToggleSwitch) + TogglesDateChanging = True - Sub ResetTogglesDate() - TOGGLE_Change = True - ToggleSwitchToday.IsOn = False - ToggleSwitchYesterday.IsOn = False - ToggleSwitchTomorrow.IsOn = False - ToggleSwitchLastWeek.IsOn = False - ToggleSwitchYear_Last.IsOn = False - ToggleSwitchYear.IsOn = False - ToggleSwitchMonth.IsOn = False - ToggleSwitchMonth_Last.IsOn = False - TOGGLE_Change = False + For Each oToggle As ToggleSwitch In TogglesDate + If pExcludeToggle IsNot Nothing Then + If oToggle.Name = pExcludeToggle.Name Then + Continue For + End If + End If + oToggle.IsOn = False + Next + + 'ToggleSwitchToday.IsOn = False + 'ToggleSwitchYesterday.IsOn = False + 'ToggleSwitchTomorrow.IsOn = False + 'ToggleSwitchLastWeek.IsOn = False + 'ToggleSwitchYear_Last.IsOn = False + 'ToggleSwitchYear.IsOn = False + 'ToggleSwitchMonth.IsOn = False + 'ToggleSwitchMonth_Last.IsOn = False + TogglesDateChanging = False End Sub Private Sub ToggleSwitchToday_Toggled(sender As Object, e As EventArgs) Handles _ @@ -65,171 +67,150 @@ Public Class frmFlowSearch1 ToggleSwitchLastWeek.Toggled, ToggleSwitchTomorrow.Toggled - If TOGGLE_Change = True Then + If TogglesDateChanging = True Then Exit Sub End If Dim oToggle As ToggleSwitch = TryCast(sender, ToggleSwitch) If oToggle.IsOn Then - TOGGLE_Change = True + TogglesDateChanging = True 'Dim oWHENDATE As String Select Case oToggle.Name Case "ToggleSwitchTomorrow" - ToggleSwitchToday.IsOn = False - ToggleSwitchYesterday.IsOn = False - ToggleSwitchTomorrow.IsOn = False - ToggleSwitchLastWeek.IsOn = False - ToggleSwitchYear_Last.IsOn = False - ToggleSwitchYear.IsOn = False - ToggleSwitchMonth.IsOn = False - ToggleSwitchMonth_Last.IsOn = False + 'ToggleSwitchToday.IsOn = False + 'ToggleSwitchYesterday.IsOn = False + 'ToggleSwitchTomorrow.IsOn = False + 'ToggleSwitchLastWeek.IsOn = False + 'ToggleSwitchYear_Last.IsOn = False + 'ToggleSwitchYear.IsOn = False + 'ToggleSwitchMonth.IsOn = False + 'ToggleSwitchMonth_Last.IsOn = False 'oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_TOMORROW) - DateConstraint = CREATED_TOMORROW + 'DateConstraint = CREATED_TOMORROW + + ResetTogglesDate(ToggleSwitchTomorrow) + SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.Tomorrow) Case "ToggleSwitchYear" - ToggleSwitchToday.IsOn = False - ToggleSwitchYesterday.IsOn = False - ToggleSwitchTomorrow.IsOn = False - ToggleSwitchLastWeek.IsOn = False - ToggleSwitchYear_Last.IsOn = False - ToggleSwitchMonth.IsOn = False - ToggleSwitchMonth_Last.IsOn = False + 'ToggleSwitchToday.IsOn = False + 'ToggleSwitchYesterday.IsOn = False + 'ToggleSwitchTomorrow.IsOn = False + 'ToggleSwitchLastWeek.IsOn = False + 'ToggleSwitchYear_Last.IsOn = False + 'ToggleSwitchMonth.IsOn = False + 'ToggleSwitchMonth_Last.IsOn = False 'oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_CURRENT) + 'DateConstraint = CREATED_YEAR_CURRENT + + ResetTogglesDate(ToggleSwitchYear) + SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.CurrentYear) - DateConstraint = CREATED_YEAR_CURRENT Case "ToggleSwitchYear_Last" - ToggleSwitchToday.IsOn = False - ToggleSwitchYesterday.IsOn = False - ToggleSwitchTomorrow.IsOn = False - ToggleSwitchLastWeek.IsOn = False - ToggleSwitchYear.IsOn = False - ToggleSwitchMonth.IsOn = False - ToggleSwitchMonth_Last.IsOn = False + 'ToggleSwitchToday.IsOn = False + 'ToggleSwitchYesterday.IsOn = False + 'ToggleSwitchTomorrow.IsOn = False + 'ToggleSwitchLastWeek.IsOn = False + 'ToggleSwitchYear.IsOn = False + 'ToggleSwitchMonth.IsOn = False + 'ToggleSwitchMonth_Last.IsOn = False 'oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_LAST) - DateConstraint = CREATED_TODAY + 'DateConstraint = CREATED_TODAY + + ResetTogglesDate(ToggleSwitchYear_Last) + SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.Today) Case "ToggleSwitchMonth" - ToggleSwitchToday.IsOn = False - ToggleSwitchYesterday.IsOn = False - ToggleSwitchTomorrow.IsOn = False - ToggleSwitchLastWeek.IsOn = False - ToggleSwitchYear.IsOn = False - ToggleSwitchYear_Last.IsOn = False - ToggleSwitchMonth_Last.IsOn = False + 'ToggleSwitchToday.IsOn = False + 'ToggleSwitchYesterday.IsOn = False + 'ToggleSwitchTomorrow.IsOn = False + 'ToggleSwitchLastWeek.IsOn = False + 'ToggleSwitchYear.IsOn = False + 'ToggleSwitchYear_Last.IsOn = False + 'ToggleSwitchMonth_Last.IsOn = False 'oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = MONTH(GETDATE())", CREATED_MONTH_CURR) - DateConstraint = CREATED_MONTH_CURR + 'DateConstraint = CREATED_MONTH_CURR + + ResetTogglesDate(ToggleSwitchMonth) + SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.CurrentMonth) Case "ToggleSwitchMonth_Last" - ToggleSwitchToday.IsOn = False - ToggleSwitchYesterday.IsOn = False - ToggleSwitchTomorrow.IsOn = False - ToggleSwitchLastWeek.IsOn = False - ToggleSwitchYear.IsOn = False - ToggleSwitchYear_Last.IsOn = False - ToggleSwitchMonth.IsOn = False + 'ToggleSwitchToday.IsOn = False + 'ToggleSwitchYesterday.IsOn = False + 'ToggleSwitchTomorrow.IsOn = False + 'ToggleSwitchLastWeek.IsOn = False + 'ToggleSwitchYear.IsOn = False + 'ToggleSwitchYear_Last.IsOn = False + 'ToggleSwitchMonth.IsOn = False 'Dim currentDate As DateTime = DateTime.Now 'If currentDate.Month = 1 Then ' oWHENDATE = GET_DATE_LIMITATION($"MONTH(@ATTRIBUTE) = 12 {vbNewLine}AND YEAR(@ATTRIBUTE) = (YEAR(GETDATE()) -1)", CREATED_MONTH_LAST) 'Else ' oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = (MONTH(GETDATE()) -1)", CREATED_MONTH_LAST) 'End If - DateConstraint = CREATED_MONTH_LAST + 'DateConstraint = CREATED_MONTH_LAST + + ResetTogglesDate(ToggleSwitchMonth_Last) + SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.LastMonth) Case "ToggleSwitchToday" - ToggleSwitchYesterday.IsOn = False - ToggleSwitchTomorrow.IsOn = False - ToggleSwitchLastWeek.IsOn = False - ToggleSwitchYear.IsOn = False - ToggleSwitchYear_Last.IsOn = False - ToggleSwitchMonth.IsOn = False - ToggleSwitchMonth_Last.IsOn = False + 'ToggleSwitchYesterday.IsOn = False + 'ToggleSwitchTomorrow.IsOn = False + 'ToggleSwitchLastWeek.IsOn = False + 'ToggleSwitchYear.IsOn = False + 'ToggleSwitchYear_Last.IsOn = False + 'ToggleSwitchMonth.IsOn = False + 'ToggleSwitchMonth_Last.IsOn = False 'oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE())", CREATED_TODAY) - DateConstraint = CREATED_TODAY + 'DateConstraint = CREATED_TODAY + + ResetTogglesDate(ToggleSwitchToday) + SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.Today) Case "ToggleSwitchYesterday" - ToggleSwitchToday.IsOn = False - ToggleSwitchTomorrow.IsOn = False - ToggleSwitchLastWeek.IsOn = False - ToggleSwitchYear.IsOn = False - ToggleSwitchYear_Last.IsOn = False - ToggleSwitchMonth.IsOn = False - ToggleSwitchMonth_Last.IsOn = False + 'ToggleSwitchToday.IsOn = False + 'ToggleSwitchTomorrow.IsOn = False + 'ToggleSwitchLastWeek.IsOn = False + 'ToggleSwitchYear.IsOn = False + 'ToggleSwitchYear_Last.IsOn = False + 'ToggleSwitchMonth.IsOn = False + 'ToggleSwitchMonth_Last.IsOn = False 'oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_YESTERDAY) - DateConstraint = CREATED_YESTERDAY + 'DateConstraint = CREATED_YESTERDAY + + ResetTogglesDate(ToggleSwitchYesterday) + SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.Yesterday) Case "ToggleSwitchLastWeek" - ToggleSwitchToday.IsOn = False - ToggleSwitchTomorrow.IsOn = False - ToggleSwitchYesterday.IsOn = False - ToggleSwitchYear.IsOn = False - ToggleSwitchYear_Last.IsOn = False - ToggleSwitchMonth.IsOn = False - ToggleSwitchMonth_Last.IsOn = False + 'ToggleSwitchToday.IsOn = False + 'ToggleSwitchTomorrow.IsOn = False + 'ToggleSwitchYesterday.IsOn = False + 'ToggleSwitchYear.IsOn = False + 'ToggleSwitchYear_Last.IsOn = False + 'ToggleSwitchMonth.IsOn = False + 'ToggleSwitchMonth_Last.IsOn = False 'oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_LAST_7_DAYS) - DateConstraint = CREATED_LAST_7_DAYS + 'DateConstraint = CREATED_LAST_7_DAYS + + ResetTogglesDate(ToggleSwitchLastWeek) + SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.Last7Days) End Select 'SEARCH_FACT_DATE = oWHENDATE - TOGGLE_Change = False + TogglesDateChanging = False 'LIMITATION_DATE = True Else If ToggleSwitchToday.IsOn = False And ToggleSwitchYesterday.IsOn = False And ToggleSwitchYear.IsOn = False And ToggleSwitchYear_Last.IsOn = False And ToggleSwitchMonth_Last.IsOn = False And ToggleSwitchMonth.IsOn = False And ToggleSwitchLastWeek.IsOn = False And ToggleSwitchTomorrow.IsOn = False Then 'LIMITATION_DATE = False - DateConstraint = "" + 'DateConstraint = "" + SearchRunner.SetDateConstraint() End If End If End Sub - 'Private Function GetDateConstraint(pDateConstraint As DateConstraint) As String - ' Select Case pDateConstraint - ' Case DateConstraint.Today - ' Return GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE())", CREATED_TODAY) - - ' Case DateConstraint.Yesterday - ' Return GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_YESTERDAY) - - ' Case DateConstraint.Last7Days - ' Return GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_LAST_7_DAYS) - - ' Case DateConstraint.CurrentMonth - ' Return GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = MONTH(GETDATE())", CREATED_MONTH_CURR) - - ' Case DateConstraint.LastMonth - ' If Now.Month = 1 Then - ' Return GET_DATE_LIMITATION($"MONTH(@ATTRIBUTE) = 12 {vbNewLine}AND YEAR(@ATTRIBUTE) = (YEAR(GETDATE()) -1)", CREATED_MONTH_LAST) - ' Else - ' Return GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = (MONTH(GETDATE()) -1)", CREATED_MONTH_LAST) - ' End If - - ' Case DateConstraint.CurrentYear - ' Return GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_CURRENT) - - ' Case DateConstraint.LastYear - ' Return GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_LAST) - ' Case Else - ' Return "" - ' End Select - 'End Function - - 'Private Function GET_DATE_LIMITATION(pInput As String, pVariant As String) As String - ' Try - ' If SEARCH_FACT_DATE_ATTRIBUTE = SEARCH_FACT_DATE_DEFAULT Then - ' SEARCH_PARAM3 = pVariant - ' Return pInput.Replace("@ATTRIBUTE", "OBJ.ADDED_WHEN") - - ' Else - ' Dim oSTR = $"GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]" - ' Return pInput.Replace("@ATTRIBUTE", oSTR) - ' End If - ' Catch ex As Exception - ' Return pInput - ' Logger.Error(ex) - ' End Try - 'End Function Private Sub cmbLimitationDateAttr_SelectedValueChanged(sender As Object, e As EventArgs) Handles cmbLimitationDateAttr.SelectedValueChanged If cmbLimitationDateAttr.SelectedIndex <> -1 Then @@ -238,9 +219,11 @@ Public Class frmFlowSearch1 Dim oEditValue As String = cmbLimitationDateAttr.SelectedItem.ToString If oEditValue = IDB_ADDED_WHEN_String_German Or oEditValue = IDB_ADDED_WHEN_String_Englisch Then - AttributeSearch = SEARCH_FACT_DATE_DEFAULT + 'AttributeSearch = SEARCH_FACT_DATE_DEFAULT + SearchRunner.SetDateAttribute() Else - AttributeSearch = oEditValue + 'AttributeSearch = oEditValue + SearchRunner.SetDateAttribute(oEditValue) 'SEARCH_FACT_DATE = $"MONTH(GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]) <> 13" End If 'SearchContent() @@ -252,6 +235,7 @@ Public Class frmFlowSearch1 Private Sub frmFlowSearch1_Load(sender As Object, e As EventArgs) Handles Me.Load Logger = My.LogConfig.GetLogger() + SearchRunner = New SearchRunner(My.LogConfig, My.Application.GetEnvironment) Try If My.Application.User.Language = "de-DE" Then @@ -267,7 +251,7 @@ Public Class frmFlowSearch1 End If Next - _Environment = My.Application.GetEnvironment + Environment = My.Application.GetEnvironment 'Dim editor As BarEditItem = BarEditItemDate ' editor = TryCast(BarEditItemDate, ComboBoxEdit) If My.Application.User.Language = "de-DE" Then @@ -285,6 +269,10 @@ Public Class frmFlowSearch1 BaseSearchSQL = BaseSearchSQL.Replace("@LANG_CODE", My.Application.User.Language) End If Next + + SearchRunner.BaseSearchSQL = BaseSearchSQL + + Dim osql = $"EXEC PRIDB_SEARCH_AUTOSUGGEST '{My.Application.User.Language}',{My.Application.User.UserId}" Dim oDTSuggest As DataTable oDTSuggest = My.Database.GetDatatableIDB(osql) @@ -298,74 +286,42 @@ Public Class frmFlowSearch1 txtSearchInput.MaskBox.AutoCompleteMode = AutoCompleteMode.SuggestAppend txtSearchInput.MaskBox.AutoCompleteCustomSource = collection + TogglesDate = New List(Of ToggleSwitch) From { + ToggleSwitchTomorrow, + ToggleSwitchToday, + ToggleSwitchYesterday, + ToggleSwitchYear, + ToggleSwitchYear_Last, + ToggleSwitchMonth, + ToggleSwitchMonth_Last, + ToggleSwitchLastWeek + } + Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical) Logger.Error(ex) End Try - Me.BringToFront() - - + BringToFront() End Sub - Private Async Function BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) As Threading.Tasks.Task Handles BarButtonItem1.ItemClick + Private Async Function BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) As Threading.Tasks.Task Handles BarButtonStartSearch.ItemClick Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) Try - Await ExecuteSearch() + 'Await ExecuteSearch() + + Dim oResult = Await SearchRunner.Run(txtSearchInput.Text, DateEditFrom.EditValue, DateEditTill.EditValue) + If oResult.OK = False Then + bsiStatus.Caption = oResult.ErrorMessage + End If Catch ex As Exception Logger.Error(ex) Finally SplashScreenManager.CloseOverlayForm(oHandle) End Try End Function - Private Async Function ExecuteSearch() As Threading.Tasks.Task - Dim oSearchTerm = txtSearchInput.Text - Dim oParams = New DocumentResultList.Params() With { - .WindowGuid = "FlowSearch", - .WindowTitle = GetResultWindowString(oSearchTerm), - .OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow, - .ProfileGuid = 354522, - .ColumnNames = New DocumentResultList.ColumnNames With { - .ObjectIdColumn = "DocID" - } - } - Dim oP3 = $"{AttributeSearch}~{DateConstraint}" - If ExplizitDate Then - Dim oDate2 As Date - If Not IsNothing(DateEditTill.EditValue) Then - oDate2 = CDate(DateEditTill.EditValue) - Else - oDate2 = CDate(DateEditFrom.EditValue) - End If - Dim oProc = $"EXEC PRIDB_SEARCH_ADD_USR_DATE {My.Application.User.UserId},'{CDate(DateEditFrom.EditValue)}','{oDate2}'" - If Await My.Database.ExecuteNonQueryIDBAsync(oProc) = True Then - oP3 = $"{AttributeSearch}~DATEPART" - End If - End If - - Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oP3}'" - - If Await My.Database.ExecuteNonQueryIDBAsync(oSQL) = True Then - Dim oDTDocResult = Await My.Database.GetDatatableIDBAsync(BaseSearchSQL) - If oDTDocResult.Rows.Count > 0 Then - oParams.Results.Add(New DocumentResultList.DocumentResult() With { - .Title = "FlowSearchXYZ", - .Datatable = oDTDocResult - }) - Dim oForm As New frmDocumentResultList(My.LogConfig, _Environment, oParams) - - AddHandler oForm.NeedsRefresh, AddressOf Form_NeedsRefresh - - oForm.Show() - Else - bsiStatus.Caption = "No Results" - End If - Else - bsiStatus.Caption = "Error in FlowSearch - Check Your log" - End If - End Function Private Sub Form_NeedsRefresh(sender As Object, e As Integer) @@ -380,7 +336,11 @@ Public Class frmFlowSearch1 Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) Try - Await ExecuteSearch() + 'Await ExecuteSearch() + Dim oResult = Await SearchRunner.Run(txtSearchInput.Text, DateEditFrom.EditValue, DateEditTill.EditValue) + If oResult.OK = False Then + bsiStatus.Caption = oResult.ErrorMessage + End If Catch ex As Exception Logger.Error(ex) Finally @@ -388,28 +348,13 @@ Public Class frmFlowSearch1 End Try End If End Function - Private Function GetResultWindowString(SearchContent As String) As String - If SearchContent <> String.Empty Then - If My.Application.User.Language = State.UserState.LANG_DE_DE Then - Return $"Suche Nach '{txtSearchInput.Text}'" - Else - Return $"Search For '{txtSearchInput.Text}'" - End If - Else - If My.Application.User.Language = State.UserState.LANG_DE_DE Then - Return $"Suche Datumsbegrenzt" - Else - Return $"Search via date" - End If - End If - End Function - - Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Private Sub BarButtonReset_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonReset.ItemClick txtSearchInput.Text = "" ResetTogglesDate() ToggleSwitchDateto.IsOn = False - ExplizitDate = False + 'ExplizitDate = False + SearchRunner.ExplicitDate = False End Sub Private Sub ToggleSwitch1_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitchDateto.Toggled @@ -428,7 +373,131 @@ Public Class frmFlowSearch1 Dim oDateFrom = DateEditFrom.EditValue If Not IsNothing(oDateFrom) Then ResetTogglesDate() - ExplizitDate = True + 'ExplizitDate = True + SearchRunner.ExplicitDate = True End If End Sub + + 'Private Function GetResultWindowString(SearchContent As String) As String + ' If SearchContent <> String.Empty Then + ' If My.Application.User.Language = State.UserState.LANG_DE_DE Then + + ' Return $"Suche Nach '{txtSearchInput.Text}'" + ' Else + ' Return $"Search For '{txtSearchInput.Text}'" + ' End If + ' Else + ' If My.Application.User.Language = State.UserState.LANG_DE_DE Then + ' Return $"Suche Datumsbegrenzt" + ' Else + ' Return $"Search via date" + ' End If + ' End If + 'End Function + + 'Private Async Function ExecuteSearch() As Threading.Tasks.Task + ' Dim oSearchTerm = txtSearchInput.Text + ' Dim oParams = New DocumentResultList.Params() With { + ' .WindowGuid = "FlowSearch", + ' .WindowTitle = GetResultWindowString(oSearchTerm), + ' .OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow, + ' .ProfileGuid = 354522, + ' .ColumnNames = New DocumentResultList.ColumnNames With { + ' .ObjectIdColumn = "DocID" + ' } + ' } + + ' Dim oP3 = $"{AttributeSearch}~{DateConstraint}" + ' If ExplizitDate Then + ' Dim oDate2 As Date + ' If Not IsNothing(DateEditTill.EditValue) Then + ' oDate2 = CDate(DateEditTill.EditValue) + ' Else + ' oDate2 = CDate(DateEditFrom.EditValue) + ' End If + ' Dim oProc = $"EXEC PRIDB_SEARCH_ADD_USR_DATE {My.Application.User.UserId},'{CDate(DateEditFrom.EditValue)}','{oDate2}'" + ' If Await My.Database.ExecuteNonQueryIDBAsync(oProc) = True Then + ' oP3 = $"{AttributeSearch}~DATEPART" + ' End If + ' End If + + ' Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oP3}'" + + ' If Await My.Database.ExecuteNonQueryIDBAsync(oSQL) = True Then + ' Dim oDTDocResult = Await My.Database.GetDatatableIDBAsync(BaseSearchSQL) + ' If oDTDocResult.Rows.Count > 0 Then + ' oParams.Results.Add(New DocumentResultList.DocumentResult() With { + ' .Title = "FlowSearchXYZ", + ' .Datatable = oDTDocResult + ' }) + ' Dim oForm As New frmDocumentResultList(My.LogConfig, _Environment, oParams) + + ' AddHandler oForm.NeedsRefresh, AddressOf Form_NeedsRefresh + + ' oForm.Show() + ' Else + ' bsiStatus.Caption = "No Results" + ' End If + ' Else + ' bsiStatus.Caption = "Error in FlowSearch - Check Your log" + ' End If + 'End Function + + 'Private Function GetDateConstraint(pDateConstraint As DateConstraint) As String + ' Select Case pDateConstraint + ' Case DateConstraint.Today + ' Return GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE())", CREATED_TODAY) + + ' Case DateConstraint.Yesterday + ' Return GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_YESTERDAY) + + ' Case DateConstraint.Last7Days + ' Return GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_LAST_7_DAYS) + + ' Case DateConstraint.CurrentMonth + ' Return GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = MONTH(GETDATE())", CREATED_MONTH_CURR) + + ' Case DateConstraint.LastMonth + ' If Now.Month = 1 Then + ' Return GET_DATE_LIMITATION($"MONTH(@ATTRIBUTE) = 12 {vbNewLine}AND YEAR(@ATTRIBUTE) = (YEAR(GETDATE()) -1)", CREATED_MONTH_LAST) + ' Else + ' Return GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = (MONTH(GETDATE()) -1)", CREATED_MONTH_LAST) + ' End If + + ' Case DateConstraint.CurrentYear + ' Return GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_CURRENT) + + ' Case DateConstraint.LastYear + ' Return GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_LAST) + + ' Case Else + ' Return "" + ' End Select + 'End Function + + 'Private Function GET_DATE_LIMITATION(pInput As String, pVariant As String) As String + ' Try + ' If SEARCH_FACT_DATE_ATTRIBUTE = SEARCH_FACT_DATE_DEFAULT Then + ' SEARCH_PARAM3 = pVariant + ' Return pInput.Replace("@ATTRIBUTE", "OBJ.ADDED_WHEN") + + ' Else + ' Dim oSTR = $"GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]" + ' Return pInput.Replace("@ATTRIBUTE", oSTR) + ' End If + ' Catch ex As Exception + ' Return pInput + ' Logger.Error(ex) + ' End Try + 'End Function + + 'Private Enum DateConstraintEnum + ' Today + ' Yesterday + ' Last7Days + ' CurrentYear + ' LastYear + ' CurrentMonth + ' LastMonth + 'End Enum End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index bdf0d917..3a221e09 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -441,6 +441,7 @@ + From 435c32d5cb3c7dad674d0a46714b6ff987427753 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 11 Apr 2022 16:07:04 +0200 Subject: [PATCH 2/4] Zooflow: Improve Search UI --- GUIs.ZooFlow/Search/SearchRunner.vb | 2 +- .../Search/frmFlowSearch1.Designer.vb | 93 +++--- GUIs.ZooFlow/Search/frmFlowSearch1.resx | 4 +- GUIs.ZooFlow/Search/frmFlowSearch1.vb | 264 ++---------------- 4 files changed, 67 insertions(+), 296 deletions(-) diff --git a/GUIs.ZooFlow/Search/SearchRunner.vb b/GUIs.ZooFlow/Search/SearchRunner.vb index a7b353c6..a99914c8 100644 --- a/GUIs.ZooFlow/Search/SearchRunner.vb +++ b/GUIs.ZooFlow/Search/SearchRunner.vb @@ -32,7 +32,7 @@ Public Class SearchRunner Public Event NeedsRefresh As EventHandler(Of Integer) - Private _ActiveDateConstraint As String = CREATED_TODAY + Private _ActiveDateConstraint As String = String.Empty Public ReadOnly Property ActiveDateConstraint As String Get Return _ActiveDateConstraint diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb index 4648961f..236b224d 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmFlowSearch1 Inherits DevExpress.XtraBars.Ribbon.RibbonForm '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 frmFlowSearch1 '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(frmFlowSearch1)) @@ -57,9 +57,9 @@ Partial Class frmFlowSearch1 Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() Me.Label1 = New System.Windows.Forms.Label() Me.cmbLimitationDateAttr = New System.Windows.Forms.ComboBox() - Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() Me.txtSearchInput = New DevExpress.XtraEditors.TextEdit() + Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit() Me.DockPanel1.SuspendLayout() @@ -86,6 +86,7 @@ Partial Class frmFlowSearch1 ' 'RibbonControl1 ' + Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified Me.RibbonControl1.ExpandCollapseItem.Id = 0 Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonStartSearch, Me.BarButtonReset, Me.bsiStatus, Me.BarSubItem1, Me.BarListItem1, Me.BarToggleSwitchItemTerm, Me.BarToggleSwitchItemFulltext}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) @@ -93,21 +94,22 @@ Partial Class frmFlowSearch1 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl1.Size = New System.Drawing.Size(936, 158) + Me.RibbonControl1.Size = New System.Drawing.Size(936, 89) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonStartSearch ' Me.BarButtonStartSearch.Caption = "Suche starten" Me.BarButtonStartSearch.Id = 1 - Me.BarButtonStartSearch.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonStartSearch.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonStartSearch.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonStartSearch.Name = "BarButtonStartSearch" + Me.BarButtonStartSearch.Visibility = DevExpress.XtraBars.BarItemVisibility.Never ' 'BarButtonReset ' Me.BarButtonReset.Caption = "Suche zurücksetzen" Me.BarButtonReset.Id = 2 - Me.BarButtonReset.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonReset.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonReset.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonReset.Name = "BarButtonReset" ' 'bsiStatus @@ -192,10 +194,10 @@ Partial Class frmFlowSearch1 Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left Me.DockPanel1.ID = New System.Guid("404a591d-3a18-4984-8b8d-d8ac23bfc3db") Me.DockPanel1.ImageOptions.SvgImage = CType(resources.GetObject("DockPanel1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.DockPanel1.Location = New System.Drawing.Point(0, 158) + Me.DockPanel1.Location = New System.Drawing.Point(0, 89) Me.DockPanel1.Name = "DockPanel1" - Me.DockPanel1.OriginalSize = New System.Drawing.Size(225, 200) - Me.DockPanel1.Size = New System.Drawing.Size(225, 587) + Me.DockPanel1.OriginalSize = New System.Drawing.Size(193, 200) + Me.DockPanel1.Size = New System.Drawing.Size(193, 656) Me.DockPanel1.Text = "Datum" ' 'DockPanel1_Container @@ -205,7 +207,7 @@ Partial Class frmFlowSearch1 Me.DockPanel1_Container.Controls.Add(Me.cmbLimitationDateAttr) Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 40) Me.DockPanel1_Container.Name = "DockPanel1_Container" - Me.DockPanel1_Container.Size = New System.Drawing.Size(218, 544) + Me.DockPanel1_Container.Size = New System.Drawing.Size(186, 613) Me.DockPanel1_Container.TabIndex = 0 ' 'XtraTabControl1 @@ -218,7 +220,7 @@ Partial Class frmFlowSearch1 Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 Me.XtraTabControl1.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[True] - Me.XtraTabControl1.Size = New System.Drawing.Size(203, 483) + Me.XtraTabControl1.Size = New System.Drawing.Size(171, 552) Me.XtraTabControl1.TabIndex = 10 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) ' @@ -239,7 +241,7 @@ Partial Class frmFlowSearch1 Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchYear_Last) Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchYear) Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(201, 458) + Me.XtraTabPage1.Size = New System.Drawing.Size(169, 527) Me.XtraTabPage1.Text = "Standard" ' 'DateEditTill @@ -260,7 +262,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchMonth_Last.Name = "ToggleSwitchMonth_Last" Me.ToggleSwitchMonth_Last.Properties.OffText = "Letzter Monat" Me.ToggleSwitchMonth_Last.Properties.OnText = "Letzter Monat" - Me.ToggleSwitchMonth_Last.Size = New System.Drawing.Size(195, 18) + Me.ToggleSwitchMonth_Last.Size = New System.Drawing.Size(195, 19) Me.ToggleSwitchMonth_Last.TabIndex = 9 ' 'ToggleSwitchDateto @@ -270,14 +272,14 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchDateto.Name = "ToggleSwitchDateto" Me.ToggleSwitchDateto.Properties.OffText = "Datum bis" Me.ToggleSwitchDateto.Properties.OnText = "Datum bis" - Me.ToggleSwitchDateto.Size = New System.Drawing.Size(122, 18) + Me.ToggleSwitchDateto.Size = New System.Drawing.Size(122, 19) Me.ToggleSwitchDateto.TabIndex = 0 ' 'lblDatefrom ' Me.lblDatefrom.Location = New System.Drawing.Point(3, 211) Me.lblDatefrom.Name = "lblDatefrom" - Me.lblDatefrom.Size = New System.Drawing.Size(31, 13) + Me.lblDatefrom.Size = New System.Drawing.Size(34, 13) Me.lblDatefrom.TabIndex = 3 Me.lblDatefrom.Text = "Datum" ' @@ -301,7 +303,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchMonth.Name = "ToggleSwitchMonth" Me.ToggleSwitchMonth.Properties.OffText = "Dieser Monat" Me.ToggleSwitchMonth.Properties.OnText = "Dieser Monat" - Me.ToggleSwitchMonth.Size = New System.Drawing.Size(195, 18) + Me.ToggleSwitchMonth.Size = New System.Drawing.Size(195, 19) Me.ToggleSwitchMonth.TabIndex = 8 ' 'ToggleSwitchTomorrow @@ -311,7 +313,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchTomorrow.Name = "ToggleSwitchTomorrow" Me.ToggleSwitchTomorrow.Properties.OffText = "Morgen" Me.ToggleSwitchTomorrow.Properties.OnText = "Morgen" - Me.ToggleSwitchTomorrow.Size = New System.Drawing.Size(95, 18) + Me.ToggleSwitchTomorrow.Size = New System.Drawing.Size(95, 19) Me.ToggleSwitchTomorrow.TabIndex = 7 Me.ToggleSwitchTomorrow.Visible = False ' @@ -322,7 +324,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchToday.Name = "ToggleSwitchToday" Me.ToggleSwitchToday.Properties.OffText = "Heute" Me.ToggleSwitchToday.Properties.OnText = "Heute" - Me.ToggleSwitchToday.Size = New System.Drawing.Size(95, 18) + Me.ToggleSwitchToday.Size = New System.Drawing.Size(95, 19) Me.ToggleSwitchToday.TabIndex = 2 ' 'ToggleSwitchLastWeek @@ -332,7 +334,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchLastWeek.Name = "ToggleSwitchLastWeek" Me.ToggleSwitchLastWeek.Properties.OffText = "Letzten 7 Tage" Me.ToggleSwitchLastWeek.Properties.OnText = "Letzten 7 Tage" - Me.ToggleSwitchLastWeek.Size = New System.Drawing.Size(195, 18) + Me.ToggleSwitchLastWeek.Size = New System.Drawing.Size(195, 19) Me.ToggleSwitchLastWeek.TabIndex = 6 ' 'ToggleSwitchYesterday @@ -342,7 +344,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchYesterday.Name = "ToggleSwitchYesterday" Me.ToggleSwitchYesterday.Properties.OffText = "Gestern" Me.ToggleSwitchYesterday.Properties.OnText = "Gestern" - Me.ToggleSwitchYesterday.Size = New System.Drawing.Size(95, 18) + Me.ToggleSwitchYesterday.Size = New System.Drawing.Size(95, 19) Me.ToggleSwitchYesterday.TabIndex = 3 ' 'ToggleSwitchYear_Last @@ -352,7 +354,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchYear_Last.Name = "ToggleSwitchYear_Last" Me.ToggleSwitchYear_Last.Properties.OffText = "Letztes Jahr" Me.ToggleSwitchYear_Last.Properties.OnText = "Letztes Jahr" - Me.ToggleSwitchYear_Last.Size = New System.Drawing.Size(195, 18) + Me.ToggleSwitchYear_Last.Size = New System.Drawing.Size(195, 19) Me.ToggleSwitchYear_Last.TabIndex = 5 ' 'ToggleSwitchYear @@ -362,13 +364,13 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchYear.Name = "ToggleSwitchYear" Me.ToggleSwitchYear.Properties.OffText = "Dieses Jahr" Me.ToggleSwitchYear.Properties.OnText = "Dieses Jahr" - Me.ToggleSwitchYear.Size = New System.Drawing.Size(195, 18) + Me.ToggleSwitchYear.Size = New System.Drawing.Size(195, 19) Me.ToggleSwitchYear.TabIndex = 4 ' 'XtraTabPage2 ' Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(201, 458) + Me.XtraTabPage2.Size = New System.Drawing.Size(169, 527) Me.XtraTabPage2.Text = "...tbd" ' 'Label1 @@ -376,35 +378,25 @@ Partial Class frmFlowSearch1 Me.Label1.AutoSize = True Me.Label1.Location = New System.Drawing.Point(4, 8) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(44, 13) + Me.Label1.Size = New System.Drawing.Size(47, 13) Me.Label1.TabIndex = 0 Me.Label1.Text = "Attribut" ' 'cmbLimitationDateAttr ' Me.cmbLimitationDateAttr.FormattingEnabled = True - Me.cmbLimitationDateAttr.Location = New System.Drawing.Point(7, 24) + Me.cmbLimitationDateAttr.Location = New System.Drawing.Point(6, 24) Me.cmbLimitationDateAttr.Name = "cmbLimitationDateAttr" - Me.cmbLimitationDateAttr.Size = New System.Drawing.Size(178, 21) + Me.cmbLimitationDateAttr.Size = New System.Drawing.Size(171, 21) Me.cmbLimitationDateAttr.TabIndex = 1 ' - 'LabelControl1 - ' - Me.LabelControl1.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.LabelControl1.Appearance.Options.UseFont = True - Me.LabelControl1.Location = New System.Drawing.Point(231, 166) - Me.LabelControl1.Name = "LabelControl1" - Me.LabelControl1.Size = New System.Drawing.Size(69, 17) - Me.LabelControl1.TabIndex = 3 - Me.LabelControl1.Text = "Suchbegriff:" - ' 'PictureEdit1 ' Me.PictureEdit1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.PictureEdit1.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_CW_DevExpress - Me.PictureEdit1.Location = New System.Drawing.Point(666, 516) + Me.PictureEdit1.Location = New System.Drawing.Point(709, 537) Me.PictureEdit1.MenuManager = Me.RibbonControl1 Me.PictureEdit1.Name = "PictureEdit1" Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.SystemColors.Control @@ -413,22 +405,33 @@ Partial Class frmFlowSearch1 Me.PictureEdit1.Properties.PictureAlignment = System.Drawing.ContentAlignment.BottomRight Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] Me.PictureEdit1.Properties.ZoomPercent = 300.0R - Me.PictureEdit1.Size = New System.Drawing.Size(258, 223) + Me.PictureEdit1.Size = New System.Drawing.Size(215, 202) Me.PictureEdit1.TabIndex = 8 ' 'txtSearchInput ' - Me.txtSearchInput.Location = New System.Drawing.Point(227, 189) + Me.txtSearchInput.EditValue = "" + Me.txtSearchInput.Location = New System.Drawing.Point(206, 95) Me.txtSearchInput.MenuManager = Me.RibbonControl1 Me.txtSearchInput.Name = "txtSearchInput" - Me.txtSearchInput.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSearchInput.Properties.Appearance.ForeColor = System.Drawing.Color.Blue + Me.txtSearchInput.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI Semibold", 11.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSearchInput.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(19, Byte), Integer)) Me.txtSearchInput.Properties.Appearance.Options.UseFont = True Me.txtSearchInput.Properties.Appearance.Options.UseForeColor = True + Me.txtSearchInput.Properties.NullText = "Suchbegriff eingeben" Me.txtSearchInput.Properties.Padding = New System.Windows.Forms.Padding(10) - Me.txtSearchInput.Size = New System.Drawing.Size(697, 46) + Me.txtSearchInput.Size = New System.Drawing.Size(673, 46) Me.txtSearchInput.TabIndex = 12 ' + 'SimpleButton1 + ' + Me.SimpleButton1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_CW_DevExpress + Me.SimpleButton1.ImageOptions.SvgImageSize = New System.Drawing.Size(40, 40) + Me.SimpleButton1.Location = New System.Drawing.Point(878, 95) + Me.SimpleButton1.Name = "SimpleButton1" + Me.SimpleButton1.Size = New System.Drawing.Size(46, 46) + Me.SimpleButton1.TabIndex = 16 + ' 'frmFlowSearch1 ' Me.Appearance.BackColor = System.Drawing.SystemColors.Control @@ -436,9 +439,9 @@ Partial Class frmFlowSearch1 Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(936, 769) + Me.Controls.Add(Me.SimpleButton1) Me.Controls.Add(Me.txtSearchInput) Me.Controls.Add(Me.PictureEdit1) - Me.Controls.Add(Me.LabelControl1) Me.Controls.Add(Me.DockPanel1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) @@ -495,7 +498,6 @@ Partial Class frmFlowSearch1 Friend WithEvents ToggleSwitchMonth As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents BarButtonStartSearch As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonReset As DevExpress.XtraBars.BarButtonItem - Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl Friend WithEvents bsiStatus As DevExpress.XtraBars.BarStaticItem Friend WithEvents ToggleSwitchYear As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents BarSubItem1 As DevExpress.XtraBars.BarSubItem @@ -512,4 +514,5 @@ Partial Class frmFlowSearch1 Friend WithEvents DateEditFrom As DevExpress.XtraEditors.DateEdit Friend WithEvents ToggleSwitchDateto As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents txtSearchInput As DevExpress.XtraEditors.TextEdit + Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton End Class diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.resx b/GUIs.ZooFlow/Search/frmFlowSearch1.resx index 3531dccb..db5b0340 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.resx +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -133,7 +133,7 @@ cz0iQmx1ZSIgLz4NCjwvc3ZnPgs= - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.vb index 338a7913..c8896a0d 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.vb @@ -10,22 +10,6 @@ Public Class frmFlowSearch1 Private Logger As Logger Private SearchRunner As SearchRunner - - 'Private Property AttributeSearch As String = "ADDED_WHEN" - 'Private Property DateConstraint As String = "" - 'Private LIMITATION_DATE As Boolean = False - 'Private SEARCH_FACT_DATE As String = "MONTH(OBJ.ADDED_WHEN) <> 13" - 'Private Const SEARCH_FACT_DATE_DEFAULT As String = "ADDED_WHEN" - 'Private Const CREATED_TOMORROW As String = "TOMORROW" - 'Private Const CREATED_TODAY As String = "ECM_CREATED_TODAY" - 'Private Const CREATED_YESTERDAY As String = "ECM_CREATED_YESTERDAY" - 'Private Const CREATED_LAST_7_DAYS As String = "ECM_CREATED_LAST7DAYS" - 'Private Const CREATED_YEAR_CURRENT As String = "ECM_CREATED_YEAR_CURRENT" - 'Private Const CREATED_YEAR_LAST As String = "ECM_CREATED_YEAR_LAST" - 'Private Const CREATED_MONTH_CURR As String = "ECM_CREATED_MONTH_CURRENT" - 'Private Const CREATED_MONTH_LAST As String = "ECM_CREATED_MONTH_LAST" - 'Private Property ExplizitDate As Boolean = False - Private Property BaseSearchSQL As String Private Property TogglesDate As List(Of ToggleSwitch) Private Property TogglesDateChanging As Boolean = False @@ -46,14 +30,6 @@ Public Class frmFlowSearch1 oToggle.IsOn = False Next - 'ToggleSwitchToday.IsOn = False - 'ToggleSwitchYesterday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchLastWeek.IsOn = False - 'ToggleSwitchYear_Last.IsOn = False - 'ToggleSwitchYear.IsOn = False - 'ToggleSwitchMonth.IsOn = False - 'ToggleSwitchMonth_Last.IsOn = False TogglesDateChanging = False End Sub @@ -75,136 +51,46 @@ Public Class frmFlowSearch1 If oToggle.IsOn Then TogglesDateChanging = True - 'Dim oWHENDATE As String + Select Case oToggle.Name Case "ToggleSwitchTomorrow" - 'ToggleSwitchToday.IsOn = False - 'ToggleSwitchYesterday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchLastWeek.IsOn = False - 'ToggleSwitchYear_Last.IsOn = False - 'ToggleSwitchYear.IsOn = False - 'ToggleSwitchMonth.IsOn = False - 'ToggleSwitchMonth_Last.IsOn = False - 'oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_TOMORROW) - 'DateConstraint = CREATED_TOMORROW - ResetTogglesDate(ToggleSwitchTomorrow) SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.Tomorrow) Case "ToggleSwitchYear" - 'ToggleSwitchToday.IsOn = False - 'ToggleSwitchYesterday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchLastWeek.IsOn = False - 'ToggleSwitchYear_Last.IsOn = False - 'ToggleSwitchMonth.IsOn = False - 'ToggleSwitchMonth_Last.IsOn = False - 'oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_CURRENT) - 'DateConstraint = CREATED_YEAR_CURRENT - ResetTogglesDate(ToggleSwitchYear) SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.CurrentYear) Case "ToggleSwitchYear_Last" - 'ToggleSwitchToday.IsOn = False - 'ToggleSwitchYesterday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchLastWeek.IsOn = False - 'ToggleSwitchYear.IsOn = False - 'ToggleSwitchMonth.IsOn = False - 'ToggleSwitchMonth_Last.IsOn = False - 'oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_LAST) - 'DateConstraint = CREATED_TODAY - ResetTogglesDate(ToggleSwitchYear_Last) SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.Today) Case "ToggleSwitchMonth" - 'ToggleSwitchToday.IsOn = False - 'ToggleSwitchYesterday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchLastWeek.IsOn = False - 'ToggleSwitchYear.IsOn = False - 'ToggleSwitchYear_Last.IsOn = False - 'ToggleSwitchMonth_Last.IsOn = False - 'oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = MONTH(GETDATE())", CREATED_MONTH_CURR) - 'DateConstraint = CREATED_MONTH_CURR - ResetTogglesDate(ToggleSwitchMonth) SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.CurrentMonth) Case "ToggleSwitchMonth_Last" - 'ToggleSwitchToday.IsOn = False - 'ToggleSwitchYesterday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchLastWeek.IsOn = False - 'ToggleSwitchYear.IsOn = False - 'ToggleSwitchYear_Last.IsOn = False - 'ToggleSwitchMonth.IsOn = False - 'Dim currentDate As DateTime = DateTime.Now - 'If currentDate.Month = 1 Then - ' oWHENDATE = GET_DATE_LIMITATION($"MONTH(@ATTRIBUTE) = 12 {vbNewLine}AND YEAR(@ATTRIBUTE) = (YEAR(GETDATE()) -1)", CREATED_MONTH_LAST) - 'Else - ' oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = (MONTH(GETDATE()) -1)", CREATED_MONTH_LAST) - 'End If - 'DateConstraint = CREATED_MONTH_LAST - ResetTogglesDate(ToggleSwitchMonth_Last) SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.LastMonth) Case "ToggleSwitchToday" - 'ToggleSwitchYesterday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchLastWeek.IsOn = False - 'ToggleSwitchYear.IsOn = False - 'ToggleSwitchYear_Last.IsOn = False - 'ToggleSwitchMonth.IsOn = False - 'ToggleSwitchMonth_Last.IsOn = False - 'oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE())", CREATED_TODAY) - 'DateConstraint = CREATED_TODAY - ResetTogglesDate(ToggleSwitchToday) SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.Today) Case "ToggleSwitchYesterday" - 'ToggleSwitchToday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchLastWeek.IsOn = False - 'ToggleSwitchYear.IsOn = False - 'ToggleSwitchYear_Last.IsOn = False - 'ToggleSwitchMonth.IsOn = False - 'ToggleSwitchMonth_Last.IsOn = False - 'oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_YESTERDAY) - 'DateConstraint = CREATED_YESTERDAY - ResetTogglesDate(ToggleSwitchYesterday) SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.Yesterday) Case "ToggleSwitchLastWeek" - 'ToggleSwitchToday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchYesterday.IsOn = False - 'ToggleSwitchYear.IsOn = False - 'ToggleSwitchYear_Last.IsOn = False - 'ToggleSwitchMonth.IsOn = False - 'ToggleSwitchMonth_Last.IsOn = False - 'oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_LAST_7_DAYS) - 'DateConstraint = CREATED_LAST_7_DAYS - ResetTogglesDate(ToggleSwitchLastWeek) SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.Last7Days) End Select - 'SEARCH_FACT_DATE = oWHENDATE TogglesDateChanging = False - 'LIMITATION_DATE = True + Else If ToggleSwitchToday.IsOn = False And ToggleSwitchYesterday.IsOn = False And ToggleSwitchYear.IsOn = False And ToggleSwitchYear_Last.IsOn = False And ToggleSwitchMonth_Last.IsOn = False And ToggleSwitchMonth.IsOn = False And ToggleSwitchLastWeek.IsOn = False And ToggleSwitchTomorrow.IsOn = False Then - - 'LIMITATION_DATE = False - 'DateConstraint = "" SearchRunner.SetDateConstraint() End If End If @@ -219,14 +105,10 @@ Public Class frmFlowSearch1 Dim oEditValue As String = cmbLimitationDateAttr.SelectedItem.ToString If oEditValue = IDB_ADDED_WHEN_String_German Or oEditValue = IDB_ADDED_WHEN_String_Englisch Then - 'AttributeSearch = SEARCH_FACT_DATE_DEFAULT SearchRunner.SetDateAttribute() Else - 'AttributeSearch = oEditValue SearchRunner.SetDateAttribute(oEditValue) - 'SEARCH_FACT_DATE = $"MONTH(GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]) <> 13" End If - 'SearchContent() Catch ex As Exception Logger.Error(ex) End Try @@ -281,7 +163,6 @@ Public Class frmFlowSearch1 collection.Add(orow.Item("TERM")) Next - txtSearchInput.MaskBox.AutoCompleteSource = AutoCompleteSource.CustomSource txtSearchInput.MaskBox.AutoCompleteMode = AutoCompleteMode.SuggestAppend txtSearchInput.MaskBox.AutoCompleteCustomSource = collection @@ -309,8 +190,6 @@ Public Class frmFlowSearch1 Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) Try - 'Await ExecuteSearch() - Dim oResult = Await SearchRunner.Run(txtSearchInput.Text, DateEditFrom.EditValue, DateEditTill.EditValue) If oResult.OK = False Then bsiStatus.Caption = oResult.ErrorMessage @@ -336,7 +215,6 @@ Public Class frmFlowSearch1 Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) Try - 'Await ExecuteSearch() Dim oResult = Await SearchRunner.Run(txtSearchInput.Text, DateEditFrom.EditValue, DateEditTill.EditValue) If oResult.OK = False Then bsiStatus.Caption = oResult.ErrorMessage @@ -353,7 +231,6 @@ Public Class frmFlowSearch1 txtSearchInput.Text = "" ResetTogglesDate() ToggleSwitchDateto.IsOn = False - 'ExplizitDate = False SearchRunner.ExplicitDate = False End Sub @@ -373,131 +250,22 @@ Public Class frmFlowSearch1 Dim oDateFrom = DateEditFrom.EditValue If Not IsNothing(oDateFrom) Then ResetTogglesDate() - 'ExplizitDate = True SearchRunner.ExplicitDate = True End If End Sub - 'Private Function GetResultWindowString(SearchContent As String) As String - ' If SearchContent <> String.Empty Then - ' If My.Application.User.Language = State.UserState.LANG_DE_DE Then - - ' Return $"Suche Nach '{txtSearchInput.Text}'" - ' Else - ' Return $"Search For '{txtSearchInput.Text}'" - ' End If - ' Else - ' If My.Application.User.Language = State.UserState.LANG_DE_DE Then - ' Return $"Suche Datumsbegrenzt" - ' Else - ' Return $"Search via date" - ' End If - ' End If - 'End Function - - 'Private Async Function ExecuteSearch() As Threading.Tasks.Task - ' Dim oSearchTerm = txtSearchInput.Text - ' Dim oParams = New DocumentResultList.Params() With { - ' .WindowGuid = "FlowSearch", - ' .WindowTitle = GetResultWindowString(oSearchTerm), - ' .OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow, - ' .ProfileGuid = 354522, - ' .ColumnNames = New DocumentResultList.ColumnNames With { - ' .ObjectIdColumn = "DocID" - ' } - ' } - - ' Dim oP3 = $"{AttributeSearch}~{DateConstraint}" - ' If ExplizitDate Then - ' Dim oDate2 As Date - ' If Not IsNothing(DateEditTill.EditValue) Then - ' oDate2 = CDate(DateEditTill.EditValue) - ' Else - ' oDate2 = CDate(DateEditFrom.EditValue) - ' End If - ' Dim oProc = $"EXEC PRIDB_SEARCH_ADD_USR_DATE {My.Application.User.UserId},'{CDate(DateEditFrom.EditValue)}','{oDate2}'" - ' If Await My.Database.ExecuteNonQueryIDBAsync(oProc) = True Then - ' oP3 = $"{AttributeSearch}~DATEPART" - ' End If - ' End If - - ' Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oP3}'" - - ' If Await My.Database.ExecuteNonQueryIDBAsync(oSQL) = True Then - ' Dim oDTDocResult = Await My.Database.GetDatatableIDBAsync(BaseSearchSQL) - ' If oDTDocResult.Rows.Count > 0 Then - ' oParams.Results.Add(New DocumentResultList.DocumentResult() With { - ' .Title = "FlowSearchXYZ", - ' .Datatable = oDTDocResult - ' }) - ' Dim oForm As New frmDocumentResultList(My.LogConfig, _Environment, oParams) - - ' AddHandler oForm.NeedsRefresh, AddressOf Form_NeedsRefresh - - ' oForm.Show() - ' Else - ' bsiStatus.Caption = "No Results" - ' End If - ' Else - ' bsiStatus.Caption = "Error in FlowSearch - Check Your log" - ' End If - 'End Function - - 'Private Function GetDateConstraint(pDateConstraint As DateConstraint) As String - ' Select Case pDateConstraint - ' Case DateConstraint.Today - ' Return GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE())", CREATED_TODAY) - - ' Case DateConstraint.Yesterday - ' Return GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_YESTERDAY) - - ' Case DateConstraint.Last7Days - ' Return GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_LAST_7_DAYS) - - ' Case DateConstraint.CurrentMonth - ' Return GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = MONTH(GETDATE())", CREATED_MONTH_CURR) - - ' Case DateConstraint.LastMonth - ' If Now.Month = 1 Then - ' Return GET_DATE_LIMITATION($"MONTH(@ATTRIBUTE) = 12 {vbNewLine}AND YEAR(@ATTRIBUTE) = (YEAR(GETDATE()) -1)", CREATED_MONTH_LAST) - ' Else - ' Return GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = (MONTH(GETDATE()) -1)", CREATED_MONTH_LAST) - ' End If - - ' Case DateConstraint.CurrentYear - ' Return GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_CURRENT) - - ' Case DateConstraint.LastYear - ' Return GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_LAST) - - ' Case Else - ' Return "" - ' End Select - 'End Function - - 'Private Function GET_DATE_LIMITATION(pInput As String, pVariant As String) As String - ' Try - ' If SEARCH_FACT_DATE_ATTRIBUTE = SEARCH_FACT_DATE_DEFAULT Then - ' SEARCH_PARAM3 = pVariant - ' Return pInput.Replace("@ATTRIBUTE", "OBJ.ADDED_WHEN") - - ' Else - ' Dim oSTR = $"GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]" - ' Return pInput.Replace("@ATTRIBUTE", oSTR) - ' End If - ' Catch ex As Exception - ' Return pInput - ' Logger.Error(ex) - ' End Try - 'End Function - - 'Private Enum DateConstraintEnum - ' Today - ' Yesterday - ' Last7Days - ' CurrentYear - ' LastYear - ' CurrentMonth - ' LastMonth - 'End Enum + Private Async Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click + Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) + + Try + Dim oResult = Await SearchRunner.Run(txtSearchInput.Text, DateEditFrom.EditValue, DateEditTill.EditValue) + If oResult.OK = False Then + bsiStatus.Caption = oResult.ErrorMessage + End If + Catch ex As Exception + Logger.Error(ex) + Finally + SplashScreenManager.CloseOverlayForm(oHandle) + End Try + End Sub End Class \ No newline at end of file From 98e4e6020db461a6edcff92f3cf39aa5ea9b576b Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 11 Apr 2022 16:07:49 +0200 Subject: [PATCH 3/4] Common: fix weird crash when loading object properties --- .../ObjectPropertyDialog/ctrlObjectPropertyDialog.vb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb index 74f733d5..05ea3d6d 100644 --- a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb +++ b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb @@ -21,6 +21,7 @@ Public Class ctrlObjectPropertyDialog Private Property Client As Client Private Property Environment As Environment Private Property ObjectId As Long + Private Property HostForm As Form Private ReadOnly Changes As New Dictionary(Of String, Object) @@ -40,6 +41,7 @@ Public Class ctrlObjectPropertyDialog Public Sub Initialize(pLogConfig As LogConfig, pHostForm As Form, pClient As Client, pEnv As Environment) LogConfig = pLogConfig Logger = pLogConfig.GetLogger() + HostForm = pHostForm ErrorHandler = New BaseErrorHandler(pLogConfig, pHostForm) ControlManager = New AttributeControls(pLogConfig, pEnv, pClient) @@ -91,7 +93,7 @@ Public Class ctrlObjectPropertyDialog End If IsLoading = True - Dim oLoadingHandle = SplashScreenManager.ShowOverlayForm(Me) + Enabled = False Try ObjectId = pObjectId @@ -131,7 +133,7 @@ Public Class ctrlObjectPropertyDialog Logger.Error(ex) Return False Finally - SplashScreenManager.CloseOverlayForm(oLoadingHandle) + Enabled = True IsLoading = False End Try End Function From abf50c5c44f326b7c7b286ae097531df5878fff4 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 11 Apr 2022 16:08:14 +0200 Subject: [PATCH 4/4] Common: Rework Ribbon controls and layout, add Fontsize Setting --- GUIs.Common/DocumentResultList/Config.vb | 1 + GUIs.Common/DocumentResultList/Layout.vb | 16 +- GUIs.Common/frmDocumentResultList.Designer.vb | 172 +++++++----------- GUIs.Common/frmDocumentResultList.resx | 172 ++++++++---------- GUIs.Common/frmDocumentResultList.vb | 62 +++++-- 5 files changed, 206 insertions(+), 217 deletions(-) diff --git a/GUIs.Common/DocumentResultList/Config.vb b/GUIs.Common/DocumentResultList/Config.vb index 63e1640f..adcbf1be 100644 --- a/GUIs.Common/DocumentResultList/Config.vb +++ b/GUIs.Common/DocumentResultList/Config.vb @@ -8,6 +8,7 @@ Namespace DocumentResultList Public Property SplitContainer1Horizontal As Boolean = True Public Property SplitContainer2Distance As Integer = 250 Public Property SplitContainer2Horizontal As Boolean = False + Public Property GridFontSizeDelta As Integer = 0 End Class End Namespace \ No newline at end of file diff --git a/GUIs.Common/DocumentResultList/Layout.vb b/GUIs.Common/DocumentResultList/Layout.vb index 11579920..86adb47f 100644 --- a/GUIs.Common/DocumentResultList/Layout.vb +++ b/GUIs.Common/DocumentResultList/Layout.vb @@ -32,6 +32,10 @@ Namespace DocumentResultList End Try End Sub + Public Async Function Workspace_SaveAsync(pWorkspaceManager As WorkspaceManager) As Task + Await Task.Run(Sub() Workspace_Save(pWorkspaceManager)) + End Function + Public Sub Workspace_Restore(pWorkspaceManager As WorkspaceManager) Try Dim oFileName = GetWorkspace_LayoutName() @@ -54,6 +58,10 @@ Namespace DocumentResultList End Try End Sub + Public Async Function DockManager_SaveLayoutAsync(pDockManager As DockManager) As Task + Await Task.Run(Sub() DockManager_SaveLayout(pDockManager)) + End Function + Public Sub DockManager_RestoreLayout(pDockManager As DockManager) Try Dim oFilename As String = GetDockmanager_LayoutName() @@ -81,13 +89,19 @@ Namespace DocumentResultList Public Sub GridView_SaveLayout(pGridView As GridView) Try Dim oFileName As String = GetGrid_LayoutName(pGridView) - pGridView.SaveLayoutToXml(oFileName, OptionsLayoutBase.FullLayout) + Using oStream = New IO.FileStream(oFileName, IO.FileMode.Open) + pGridView.SaveLayoutToStream(oStream, OptionsLayoutBase.FullLayout) + End Using Catch ex As Exception Logger.Error(ex) Logger.Info("Error while saving GridLayout: " & ex.Message) End Try End Sub + Public Async Function GridView_SaveLayoutAsync(pGridView As GridView) As Task + Await Task.Run(Sub() GridView_SaveLayout(pGridView)) + End Function + Public Function GetDockmanager_LayoutName() As String Dim Filename As String = $"DockManagerDocResult_UserLayout.xml" Dim oDirectory As String = IO.Path.GetDirectoryName(Config.UserConfigPath) diff --git a/GUIs.Common/frmDocumentResultList.Designer.vb b/GUIs.Common/frmDocumentResultList.Designer.vb index 55712932..0aac8473 100644 --- a/GUIs.Common/frmDocumentResultList.Designer.vb +++ b/GUIs.Common/frmDocumentResultList.Designer.vb @@ -62,24 +62,20 @@ Partial Class frmDocumentResultList Me.BarButtonItem11 = New DevExpress.XtraBars.BarButtonItem() Me.BarWorkspaceMenuItem1 = New DevExpress.XtraBars.BarWorkspaceMenuItem() Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager(Me.components) - Me.RibbonPageCategoryFile = New DevExpress.XtraBars.Ribbon.RibbonPageCategory() - Me.RibbonPageActions1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroupFilesystem = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageActions2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup8 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageCategoryAttribute = New DevExpress.XtraBars.Ribbon.RibbonPageCategory() - Me.RibbonPageAttribute = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.BarEditItemGridFontSize = New DevExpress.XtraBars.BarEditItem() + Me.cmbGridFontSize = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup_Navigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupExport = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupDocument = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupFilesystem = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupCheckInOut = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupWorkflow = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupAttribute = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup9 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup_Layout = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() Me.RepositoryItemTextEdit2 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() Me.RepositoryItemSearchControl1 = New DevExpress.XtraEditors.Repository.RepositoryItemSearchControl() @@ -123,6 +119,7 @@ Partial Class frmDocumentResultList CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.cmbGridFontSize, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemSearchControl1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -216,14 +213,13 @@ Partial Class frmDocumentResultList 'RibbonControl ' Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetGridLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemProperties, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonResetWindowLayout, Me.MenuItemStartAdhocWorkflow, Me.MenuItemCheckInFile, Me.MenuItemCheckOutFile, Me.MenuItemVersionFile, Me.chkGridShowQuickfilter, Me.chkGridShowGrouping, Me.chkGridShowTitle, Me.MenuItemSaveProperties, Me.BarButtonItem11, Me.BarWorkspaceMenuItem1}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetGridLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemProperties, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonResetWindowLayout, Me.MenuItemStartAdhocWorkflow, Me.MenuItemCheckInFile, Me.MenuItemCheckOutFile, Me.MenuItemVersionFile, Me.chkGridShowQuickfilter, Me.chkGridShowGrouping, Me.chkGridShowTitle, Me.MenuItemSaveProperties, Me.BarButtonItem11, Me.BarWorkspaceMenuItem1, Me.BarEditItemGridFontSize}) resources.ApplyResources(Me.RibbonControl, "RibbonControl") - Me.RibbonControl.MaxItemId = 49 + Me.RibbonControl.MaxItemId = 53 Me.RibbonControl.Name = "RibbonControl" - Me.RibbonControl.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryFile, Me.RibbonPageCategoryAttribute}) Me.RibbonControl.PageHeaderItemLinks.Add(Me.BarWorkspaceMenuItem1) Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPage2}) - Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemSearchControl1}) + Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemSearchControl1, Me.cmbGridFontSize}) Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl.ShowToolbarCustomizeItem = False Me.RibbonControl.StatusBar = Me.RibbonStatusBar @@ -278,7 +274,7 @@ Partial Class frmDocumentResultList ' resources.ApplyResources(Me.BarButtonResetGridLayout, "BarButtonResetGridLayout") Me.BarButtonResetGridLayout.Id = 10 - Me.BarButtonResetGridLayout.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonResetLayout.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonResetGridLayout.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonResetGridLayout.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonResetGridLayout.Name = "BarButtonResetGridLayout" Me.BarButtonResetGridLayout.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing ' @@ -485,78 +481,22 @@ Partial Class frmDocumentResultList Me.WorkspaceManager1.TargetControl = Me Me.WorkspaceManager1.TransitionType = FadeTransition1 ' - 'RibbonPageCategoryFile - ' - Me.RibbonPageCategoryFile.Appearance.BackColor = System.Drawing.Color.DarkGreen - Me.RibbonPageCategoryFile.Appearance.Options.UseBackColor = True - Me.RibbonPageCategoryFile.Name = "RibbonPageCategoryFile" - Me.RibbonPageCategoryFile.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageActions1, Me.RibbonPageActions2}) - resources.ApplyResources(Me.RibbonPageCategoryFile, "RibbonPageCategoryFile") - ' - 'RibbonPageActions1 - ' - Me.RibbonPageActions1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroupFilesystem}) - Me.RibbonPageActions1.Name = "RibbonPageActions1" - resources.ApplyResources(Me.RibbonPageActions1, "RibbonPageActions1") - ' - 'RibbonPageGroup3 - ' - Me.RibbonPageGroup3.ItemLinks.Add(Me.MenuItemFileOpen) - Me.RibbonPageGroup3.ItemLinks.Add(Me.MenuItemProperties) - Me.RibbonPageGroup3.Name = "RibbonPageGroup3" - resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") - ' - 'RibbonPageGroupFilesystem - ' - Me.RibbonPageGroupFilesystem.ItemLinks.Add(Me.MenuItemFolderOpen) - Me.RibbonPageGroupFilesystem.ItemLinks.Add(Me.MenuItemFilepathCopy) - Me.RibbonPageGroupFilesystem.ItemLinks.Add(Me.MenuItemFolderpathCopy) - Me.RibbonPageGroupFilesystem.Name = "RibbonPageGroupFilesystem" - resources.ApplyResources(Me.RibbonPageGroupFilesystem, "RibbonPageGroupFilesystem") - ' - 'RibbonPageActions2 - ' - Me.RibbonPageActions2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4, Me.RibbonPageGroup8}) - Me.RibbonPageActions2.Name = "RibbonPageActions2" - resources.ApplyResources(Me.RibbonPageActions2, "RibbonPageActions2") - ' - 'RibbonPageGroup4 - ' - Me.RibbonPageGroup4.ItemLinks.Add(Me.MenuItemStartAdhocWorkflow) - Me.RibbonPageGroup4.Name = "RibbonPageGroup4" - resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4") - ' - 'RibbonPageGroup8 - ' - Me.RibbonPageGroup8.ItemLinks.Add(Me.MenuItemCheckOutFile) - Me.RibbonPageGroup8.ItemLinks.Add(Me.MenuItemCheckInFile) - Me.RibbonPageGroup8.ItemLinks.Add(Me.MenuItemVersionFile) - Me.RibbonPageGroup8.Name = "RibbonPageGroup8" - resources.ApplyResources(Me.RibbonPageGroup8, "RibbonPageGroup8") + 'BarEditItemGridFontSize ' - 'RibbonPageCategoryAttribute + resources.ApplyResources(Me.BarEditItemGridFontSize, "BarEditItemGridFontSize") + Me.BarEditItemGridFontSize.Edit = Me.cmbGridFontSize + Me.BarEditItemGridFontSize.Id = 52 + Me.BarEditItemGridFontSize.Name = "BarEditItemGridFontSize" ' - Me.RibbonPageCategoryAttribute.Appearance.BackColor = System.Drawing.Color.DodgerBlue - Me.RibbonPageCategoryAttribute.Appearance.Options.UseBackColor = True - Me.RibbonPageCategoryAttribute.Name = "RibbonPageCategoryAttribute" - Me.RibbonPageCategoryAttribute.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageAttribute}) - resources.ApplyResources(Me.RibbonPageCategoryAttribute, "RibbonPageCategoryAttribute") + 'cmbGridFontSize ' - 'RibbonPageAttribute - ' - Me.RibbonPageAttribute.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2}) - Me.RibbonPageAttribute.Name = "RibbonPageAttribute" - resources.ApplyResources(Me.RibbonPageAttribute, "RibbonPageAttribute") - ' - 'RibbonPageGroup2 - ' - Me.RibbonPageGroup2.ItemLinks.Add(Me.MenuItemSaveProperties) - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2") + 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" ' 'RibbonPageStart ' - Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroupExport, Me.RibbonPageGroup5}) + Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroupExport, Me.RibbonPageGroup5, Me.RibbonPageGroupDocument, Me.RibbonPageGroupFilesystem, Me.RibbonPageGroupCheckInOut, Me.RibbonPageGroupWorkflow, Me.RibbonPageGroupAttribute}) Me.RibbonPageStart.Name = "RibbonPageStart" resources.ApplyResources(Me.RibbonPageStart, "RibbonPageStart") ' @@ -581,9 +521,44 @@ Partial Class frmDocumentResultList Me.RibbonPageGroup5.Name = "RibbonPageGroup5" resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5") ' + 'RibbonPageGroupDocument + ' + Me.RibbonPageGroupDocument.ItemLinks.Add(Me.MenuItemFileOpen) + Me.RibbonPageGroupDocument.ItemLinks.Add(Me.MenuItemProperties) + Me.RibbonPageGroupDocument.Name = "RibbonPageGroupDocument" + resources.ApplyResources(Me.RibbonPageGroupDocument, "RibbonPageGroupDocument") + ' + 'RibbonPageGroupFilesystem + ' + Me.RibbonPageGroupFilesystem.ItemLinks.Add(Me.MenuItemFolderOpen) + Me.RibbonPageGroupFilesystem.ItemLinks.Add(Me.MenuItemFilepathCopy) + Me.RibbonPageGroupFilesystem.ItemLinks.Add(Me.MenuItemFolderpathCopy) + Me.RibbonPageGroupFilesystem.Name = "RibbonPageGroupFilesystem" + resources.ApplyResources(Me.RibbonPageGroupFilesystem, "RibbonPageGroupFilesystem") + ' + 'RibbonPageGroupCheckInOut + ' + Me.RibbonPageGroupCheckInOut.ItemLinks.Add(Me.MenuItemCheckOutFile) + Me.RibbonPageGroupCheckInOut.ItemLinks.Add(Me.MenuItemCheckInFile) + Me.RibbonPageGroupCheckInOut.ItemLinks.Add(Me.MenuItemVersionFile) + Me.RibbonPageGroupCheckInOut.Name = "RibbonPageGroupCheckInOut" + resources.ApplyResources(Me.RibbonPageGroupCheckInOut, "RibbonPageGroupCheckInOut") + ' + 'RibbonPageGroupWorkflow + ' + Me.RibbonPageGroupWorkflow.ItemLinks.Add(Me.MenuItemStartAdhocWorkflow) + Me.RibbonPageGroupWorkflow.Name = "RibbonPageGroupWorkflow" + resources.ApplyResources(Me.RibbonPageGroupWorkflow, "RibbonPageGroupWorkflow") + ' + 'RibbonPageGroupAttribute + ' + Me.RibbonPageGroupAttribute.ItemLinks.Add(Me.MenuItemSaveProperties) + Me.RibbonPageGroupAttribute.Name = "RibbonPageGroupAttribute" + resources.ApplyResources(Me.RibbonPageGroupAttribute, "RibbonPageGroupAttribute") + ' 'RibbonPage2 ' - Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup9, Me.RibbonPageGroup1, Me.RibbonPageGroup_Layout}) + Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup9, Me.RibbonPageGroup1}) Me.RibbonPage2.Name = "RibbonPage2" resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") ' @@ -593,6 +568,9 @@ Partial Class frmDocumentResultList Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowGrouping) Me.RibbonPageGroup9.ItemLinks.Add(Me.chkGridShowTitle) Me.RibbonPageGroup9.ItemLinks.Add(Me.BarButtonItem11) + Me.RibbonPageGroup9.ItemLinks.Add(Me.SwitchDetailContainerHorizontal) + Me.RibbonPageGroup9.ItemLinks.Add(Me.SwitchMainContainerHorizontal) + Me.RibbonPageGroup9.ItemLinks.Add(Me.BarEditItemGridFontSize) Me.RibbonPageGroup9.Name = "RibbonPageGroup9" resources.ApplyResources(Me.RibbonPageGroup9, "RibbonPageGroup9") ' @@ -604,13 +582,6 @@ Partial Class frmDocumentResultList Me.RibbonPageGroup1.Name = "RibbonPageGroup1" resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") ' - 'RibbonPageGroup_Layout - ' - Me.RibbonPageGroup_Layout.ItemLinks.Add(Me.SwitchMainContainerHorizontal) - Me.RibbonPageGroup_Layout.ItemLinks.Add(Me.SwitchDetailContainerHorizontal) - Me.RibbonPageGroup_Layout.Name = "RibbonPageGroup_Layout" - resources.ApplyResources(Me.RibbonPageGroup_Layout, "RibbonPageGroup_Layout") - ' 'RepositoryItemTextEdit1 ' resources.ApplyResources(Me.RepositoryItemTextEdit1, "RepositoryItemTextEdit1") @@ -829,7 +800,7 @@ Partial Class frmDocumentResultList Me.LayoutControlItem1.Name = "LayoutControlItem1" Me.LayoutControlItem1.Size = New System.Drawing.Size(224, 24) resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1") - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(137, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(126, 13) ' 'LayoutControlItem2 ' @@ -838,7 +809,7 @@ Partial Class frmDocumentResultList Me.LayoutControlItem2.Name = "LayoutControlItem2" Me.LayoutControlItem2.Size = New System.Drawing.Size(224, 24) resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2") - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(137, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(126, 13) ' 'EmptySpaceItem1 ' @@ -913,6 +884,7 @@ Partial Class frmDocumentResultList CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.cmbGridFontSize, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemSearchControl1, System.ComponentModel.ISupportInitialize).EndInit() @@ -954,7 +926,6 @@ Partial Class frmDocumentResultList Friend WithEvents RibbonControl As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents RibbonPageStart As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup_Layout As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents SwitchMainContainerHorizontal As DevExpress.XtraBars.BarToggleSwitchItem Friend WithEvents SwitchDetailContainerHorizontal As DevExpress.XtraBars.BarToggleSwitchItem @@ -998,8 +969,7 @@ Partial Class frmDocumentResultList Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageActions1 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupDocument As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonPageGroupFilesystem As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup @@ -1012,9 +982,7 @@ Partial Class frmDocumentResultList Friend WithEvents DockPanel2_Container As DevExpress.XtraBars.Docking.ControlContainer Friend WithEvents BarButtonResetWindowLayout As DevExpress.XtraBars.BarButtonItem Friend WithEvents CtrlObjectPropertyDialog As ctrlObjectPropertyDialog - Friend WithEvents RibbonPageCategoryFile As DevExpress.XtraBars.Ribbon.RibbonPageCategory - Friend WithEvents RibbonPageActions2 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupWorkflow As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents MenuItemStartAdhocWorkflow As DevExpress.XtraBars.BarButtonItem Friend WithEvents MenuItemCheckInFile As DevExpress.XtraBars.BarButtonItem Friend WithEvents MenuItemCheckOutFile As DevExpress.XtraBars.BarButtonItem @@ -1023,15 +991,13 @@ Partial Class frmDocumentResultList Friend WithEvents chkGridShowQuickfilter As DevExpress.XtraBars.BarCheckItem Friend WithEvents chkGridShowGrouping As DevExpress.XtraBars.BarCheckItem Friend WithEvents chkGridShowTitle As DevExpress.XtraBars.BarCheckItem - Friend WithEvents RibbonPageGroup8 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupCheckInOut As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonPageGroup9 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents MenuItemSaveProperties As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem11 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarWorkspaceMenuItem1 As DevExpress.XtraBars.BarWorkspaceMenuItem Friend WithEvents WorkspaceManager1 As DevExpress.Utils.WorkspaceManager - Friend WithEvents RibbonPageCategoryAttribute As DevExpress.XtraBars.Ribbon.RibbonPageCategory - Friend WithEvents RibbonPageAttribute As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupAttribute As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents DockPanelStatus As DevExpress.XtraBars.Docking.DockPanel Friend WithEvents ControlContainer1 As DevExpress.XtraBars.Docking.ControlContainer Friend WithEvents panelContainerStatus As DevExpress.XtraBars.Docking.DockPanel @@ -1044,4 +1010,6 @@ Partial Class frmDocumentResultList Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem Friend WithEvents RepositoryItemSearchControl1 As DevExpress.XtraEditors.Repository.RepositoryItemSearchControl + Friend WithEvents BarEditItemGridFontSize As DevExpress.XtraBars.BarEditItem + Friend WithEvents cmbGridFontSize As DevExpress.XtraEditors.Repository.RepositoryItemComboBox End Class diff --git a/GUIs.Common/frmDocumentResultList.resx b/GUIs.Common/frmDocumentResultList.resx index 2fcae6c6..abb7d9a4 100644 --- a/GUIs.Common/frmDocumentResultList.resx +++ b/GUIs.Common/frmDocumentResultList.resx @@ -253,9 +253,9 @@ - Aktives Tabellen Layout zurücksetzen + Tabellenlayout zurücksetzen - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -445,7 +445,7 @@ BarButtonItem5 - Fenster Layout zurücksetzen + Fensterlayout zurücksetzen Adhoc Workflow starten @@ -503,7 +503,7 @@ DocumentViewer1 - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.8.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.7.0.0, Culture=neutral, PublicKeyToken=null DockPanel1_Container @@ -554,10 +554,10 @@ 0 - 173, 45 + 162, 45 - 71, 20 + 82, 20 4 @@ -578,7 +578,7 @@ - 173, 69 + 162, 69 @@ -588,7 +588,7 @@ Combo - 71, 20 + 82, 20 5 @@ -1135,88 +1135,70 @@ DevExpress.Utils.WorkspaceManager, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageCategoryFile + + BarEditItemGridFontSize - - DevExpress.XtraBars.Ribbon.RibbonPageCategory, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DevExpress.XtraBars.BarEditItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageActions1 + + cmbGridFontSize - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup3 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroupFilesystem - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageActions2 + + RibbonPageStart - + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup4 + + RibbonPageGroup_Navigation - + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup8 + + RibbonPageGroupExport - + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageCategoryAttribute - - - DevExpress.XtraBars.Ribbon.RibbonPageCategory, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageAttribute + + RibbonPageGroup5 - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup2 + + RibbonPageGroupDocument - + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageStart + + RibbonPageGroupFilesystem - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup_Navigation + + RibbonPageGroupCheckInOut - + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroupExport + + RibbonPageGroupWorkflow - + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup5 + + RibbonPageGroupAttribute - + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -1237,12 +1219,6 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup_Layout - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - RepositoryItemTextEdit1 @@ -1345,38 +1321,20 @@ DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 0, 0 - - - Dokument - - - Dateien und Ordner - - - Aktionen 1 - - - Workflow - - - Bearbeiten - - - Aktionen 2 + + Schriftgröße - - Datei + + False - - Attribute + + Combo - - Aktionen + + 100 - - Attribute + + 0, 0 Navigation @@ -1387,18 +1345,30 @@ Aktualisieren + + Dokument + + + Dateien und Ordner + + + Bearbeiten + + + Workflow + + + Attribute + Start - Tabellen Einstellungen + Tabelle Zurücksetzen - - Layout - Layout diff --git a/GUIs.Common/frmDocumentResultList.vb b/GUIs.Common/frmDocumentResultList.vb index b6d14275..6aaf892a 100644 --- a/GUIs.Common/frmDocumentResultList.vb +++ b/GUIs.Common/frmDocumentResultList.vb @@ -172,9 +172,26 @@ Public Class frmDocumentResultList RibbonPageGroupFilesystem.Visible = False End If + Dim oFontSizeDeltaList = New List(Of FontSetting) From { + New FontSetting With {.Title = "Normal", .Value = 0}, + New FontSetting With {.Title = "Groß", .Value = 1}, + New FontSetting With {.Title = "Größer", .Value = 2}, + New FontSetting With {.Title = "Noch Größer", .Value = 3} + } + cmbGridFontSize.Items.Clear() + cmbGridFontSize.Items.AddRange(oFontSizeDeltaList) + BarEditItemGridFontSize.EditValue = oFontSizeDeltaList. + Where(Function(delta) delta.Value = Config.Config.GridFontSizeDelta). + FirstOrDefault() + If OperationMode = OperationMode.NoAppServer Then - RibbonPageCategoryAttribute.Visible = False - RibbonPageActions2.Visible = False + 'RibbonPageCategoryAttribute.Visible = False + 'RibbonPageActions2.Visible = False + RibbonPageGroupCheckInOut.Visible = False + RibbonPageGroupWorkflow.Visible = False + RibbonPageGroupAttribute.Visible = False + Else + RibbonPageGroupFilesystem.Visible = False End If If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then @@ -206,6 +223,16 @@ Public Class frmDocumentResultList 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 frmDocumentResultList_Closing(sender As Object, e As CancelEventArgs) Handles Me.FormClosing Try LayoutManager.GridView_SaveLayout(_ActiveGrid.MainView) @@ -231,12 +258,6 @@ Public Class frmDocumentResultList Dim oFullPath = oRow.ItemEx(ColumnFilepath, "") Dim oDocument As DocumentResultList.Document = Nothing - ' Show Ribbon Category - If RibbonPageCategoryFile.Visible = False Then - RibbonPageCategoryFile.Visible = True - RibbonControl.SelectedPage = RibbonPageActions1 - End If - ' Load DocumentInfo oDocument = Documentloader.Load(oObjectId, oFullPath) @@ -285,9 +306,18 @@ Public Class frmDocumentResultList Private Function UpdateRibbonActions(pDocument As DocumentResultList.Document) As Boolean Try If pDocument Is Nothing Then - RibbonPageCategoryFile.Visible = False - RibbonControl.SelectedPage = RibbonPageStart + RibbonPageGroupFilesystem.Enabled = False + RibbonPageGroupDocument.Enabled = False + RibbonPageGroupCheckInOut.Enabled = False + RibbonPageGroupWorkflow.Enabled = False + RibbonPageGroupAttribute.Enabled = False Return True + Else + RibbonPageGroupFilesystem.Enabled = True + RibbonPageGroupDocument.Enabled = True + RibbonPageGroupCheckInOut.Enabled = True + RibbonPageGroupWorkflow.Enabled = True + RibbonPageGroupAttribute.Enabled = True End If ' Hide Export and filesystem options for view only right @@ -1052,12 +1082,11 @@ Public Class frmDocumentResultList End Sub Private Sub CtrlObjectPropertyDialog_Enter(sender As Object, e As EventArgs) Handles CtrlObjectPropertyDialog.Enter - RibbonPageCategoryAttribute.Visible = True - RibbonControl.SelectedPage = RibbonPageAttribute + RibbonPageGroupAttribute.Enabled = True End Sub Private Sub CtrlObjectPropertyDialog_Leave(sender As Object, e As EventArgs) Handles CtrlObjectPropertyDialog.Leave - RibbonPageCategoryAttribute.Visible = False + RibbonPageGroupAttribute.Enabled = True End Sub Private Sub GridView1_RowStyle(sender As Object, e As RowStyleEventArgs) Handles GridView1.RowStyle @@ -1074,4 +1103,11 @@ Public Class frmDocumentResultList End If End Sub + + Private Sub BarEditItemGridFontSize_EditValueChanged(sender As Object, e As EventArgs) Handles BarEditItemGridFontSize.EditValueChanged + Config.Config.GridFontSizeDelta = DirectCast(BarEditItemGridFontSize.EditValue, FontSetting).Value + Config.Save() + + GridBuilder.WithFontSizeDelta(Config.Config.GridFontSizeDelta) + End Sub End Class \ No newline at end of file