diff --git a/app/TaskFlow/App.config b/app/TaskFlow/App.config index 967c171..dd2406f 100644 --- a/app/TaskFlow/App.config +++ b/app/TaskFlow/App.config @@ -15,7 +15,7 @@ False - PROD + TEST diff --git a/app/TaskFlow/My Project/AssemblyInfo.vb b/app/TaskFlow/My Project/AssemblyInfo.vb index c2d53b7..261fa3f 100644 --- a/app/TaskFlow/My Project/AssemblyInfo.vb +++ b/app/TaskFlow/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/TaskFlow/My Project/Settings.Designer.vb b/app/TaskFlow/My Project/Settings.Designer.vb index d4ebf54..d48b069 100644 --- a/app/TaskFlow/My Project/Settings.Designer.vb +++ b/app/TaskFlow/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -189,7 +189,7 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("TEST")> _ Public ReadOnly Property UserConfig_Prefix() As String Get Return CType(Me("UserConfig_Prefix"),String) diff --git a/app/TaskFlow/My Project/Settings.settings b/app/TaskFlow/My Project/Settings.settings index 7d122fd..c6733e6 100644 --- a/app/TaskFlow/My Project/Settings.settings +++ b/app/TaskFlow/My Project/Settings.settings @@ -36,7 +36,7 @@ False - PROD + TEST <?xml version="1.0" encoding="utf-16"?> diff --git a/app/TaskFlow/frmMain.Designer.vb b/app/TaskFlow/frmMain.Designer.vb index ce8cacd..5469c96 100644 --- a/app/TaskFlow/frmMain.Designer.vb +++ b/app/TaskFlow/frmMain.Designer.vb @@ -61,7 +61,7 @@ Partial Class frmMain Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarCheckItemAutofilter = New DevExpress.XtraBars.BarCheckItem() Me.BarCheckItem2 = New DevExpress.XtraBars.BarCheckItem() - Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItemResetLayout = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItemExportExcel = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() @@ -288,7 +288,7 @@ Partial Class frmMain 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItemExportExcel, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch, Me.barItemGridFontSize, Me.BarButtonItem8, Me.bsiRowCount, Me.BbtnitmAHWF1, Me.BbtnitmAHWF2, Me.BbtnitmAHWF3, Me.BbtnitmAHWF4, Me.bbtnitmLanguage, Me.BarButtonItem10, Me.BBtnItmNotfications}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW, Me.bsiInactivityCheck, Me.BarButtonItem2, Me.BarCheckItemAutofilter, Me.BarCheckItem2, Me.BarButtonItemResetLayout, Me.BarButtonItem4, Me.BarButtonItemExportExcel, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItemWFSingle, Me.BarButtonItemWFGroup, Me.BarButtonItemFileLink, Me.BarButtonItemMassValidation, Me.BarCheckItemShowSearch, Me.barItemGridFontSize, Me.BarButtonItem8, Me.bsiRowCount, Me.BbtnitmAHWF1, Me.BbtnitmAHWF2, Me.BbtnitmAHWF3, Me.BbtnitmAHWF4, Me.bbtnitmLanguage, Me.BarButtonItem10, Me.BBtnItmNotfications}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 54 Me.RibbonControl1.Name = "RibbonControl1" @@ -546,12 +546,12 @@ Partial Class frmMain Me.BarCheckItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarCheckItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarCheckItem2.Name = "BarCheckItem2" ' - 'BarButtonItem3 + 'BarButtonItemResetLayout ' - resources.ApplyResources(Me.BarButtonItem3, "BarButtonItem3") - Me.BarButtonItem3.Id = 30 - Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem3.Name = "BarButtonItem3" + resources.ApplyResources(Me.BarButtonItemResetLayout, "BarButtonItemResetLayout") + Me.BarButtonItemResetLayout.Id = 30 + Me.BarButtonItemResetLayout.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItemResetLayout.Name = "BarButtonItemResetLayout" ' 'BarButtonItem4 ' @@ -796,7 +796,7 @@ Partial Class frmMain Me.RibbonPageGroup6.ItemLinks.Add(Me.BarCheckItemAutofilter) Me.RibbonPageGroup6.ItemLinks.Add(Me.BarCheckItemShowSearch) Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItem4) - Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItem3) + Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItemResetLayout) Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItem6) Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonItemExportExcel) Me.RibbonPageGroup6.Name = "RibbonPageGroup6" @@ -863,6 +863,7 @@ Partial Class frmMain 'NavBarGroupProfiles ' resources.ApplyResources(Me.NavBarGroupProfiles, "NavBarGroupProfiles") + Me.NavBarGroupProfiles.Expanded = True Me.NavBarGroupProfiles.GroupStyle = DevExpress.XtraNavBar.NavBarGroupStyle.LargeIconsText Me.NavBarGroupProfiles.ImageOptions.LargeImage = CType(resources.GetObject("NavBarGroupProfiles.ImageOptions.LargeImage"), System.Drawing.Image) Me.NavBarGroupProfiles.Name = "NavBarGroupProfiles" @@ -907,6 +908,7 @@ Partial Class frmMain ' 'ContextMenuNotifyIcon ' + Me.ContextMenuNotifyIcon.ImageScalingSize = New System.Drawing.Size(24, 24) Me.ContextMenuNotifyIcon.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.PopupErinnerungInaktivierenToolStripMenuItem, Me.ToolStripSeparator1, Me.AnzeigenToolStripMenuItem, Me.OutOfRangePMFixierenToolStripMenuItem}) Me.ContextMenuNotifyIcon.Name = "ContextMenuNotifyIcon" resources.ApplyResources(Me.ContextMenuNotifyIcon, "ContextMenuNotifyIcon") @@ -1740,7 +1742,7 @@ Partial Class frmMain Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarCheckItemAutofilter As DevExpress.XtraBars.BarCheckItem Friend WithEvents BarCheckItem2 As DevExpress.XtraBars.BarCheckItem - Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItemResetLayout As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItemExportExcel As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx index 93635d9..6e94de5 100644 --- a/app/TaskFlow/frmMain.resx +++ b/app/TaskFlow/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAWABCgFgAQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAXABCgFwAQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -789,7 +789,7 @@ Y2siIC8+DQogICAgPC9nPg0KICA8L2c+DQo8L3N2Zz4L - + Layout zurücksetzen @@ -2457,10 +2457,10 @@ DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItem3 + + BarButtonItemResetLayout - + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb index 6ec7ff7..3a4a555 100644 --- a/app/TaskFlow/frmMain.vb +++ b/app/TaskFlow/frmMain.vb @@ -64,6 +64,7 @@ Public Class frmMain Private Const FullFilepatColName = "FULL_FILE_PATH" Private Const FA_NONE = "NONE" + Public Const NAVBAR_CLICKED = "NAVBAR LINK CLICKED" Private Class S Inherits My.Resources.frmMain_Strings @@ -627,8 +628,9 @@ Public Class frmMain End If Try - Dim xml As String = GetLayoutName_GridMain() - GridViewWorkflows.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout) + Dim oXmlPath As String = GetLayoutName_GridMain() + GridViewWorkflows.SaveLayoutToXml(oXmlPath, OptionsLayoutBase.FullLayout) + LOGGER.Debug("Layout saved successfully!") Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("Error while saving GridLayout MainGrid: " & ex.Message) @@ -641,13 +643,43 @@ Public Class frmMain End If Try - Dim oXml As String = GetLayoutName_GridMain() - GridViewWorkflows.RestoreLayoutFromXml(oXml, OptionsLayoutBase.FullLayout) + Dim oXmlPath As String = GetLayoutName_GridMain() + If System.IO.File.Exists(oXmlPath) Then + GridViewWorkflows.RestoreLayoutFromXml(oXmlPath, OptionsLayoutBase.FullLayout) + Else + LOGGER.Info("oXmlPath not existing - Saving Layout") + COLUMNS_INVISIBLE() + SaveGridLayout() + End If + Catch ex As Exception LOGGER.Info("Error while restoring layout MainGrid: " & ex.Message) End Try End Sub + Private Sub COLUMNS_INVISIBLE() + Try + GridViewWorkflows.Columns.Item("PROFILE_ID").Visible = False + GridViewWorkflows.Columns.Item("GUID").Visible = False + Try + GridViewWorkflows.Columns.Item(FullFilepatColName).Visible = False + Catch ex As Exception + End Try + Try + 'GridViewWorkflows.Columns.Item("DocID").Visible = False + GridViewWorkflows.Columns.Item("TL_STATE").Visible = False + Catch ex As Exception + + End Try + Try + GridViewWorkflows.Columns.Item("CONV_YN").Visible = False + Catch ex As Exception + + End Try + Catch ex As Exception + + End Try + End Sub Private Sub ResetLayout() Try Timer_Inactivity_Reset_Disable("ResetLayout") @@ -669,19 +701,9 @@ Public Class frmMain GridViewWorkflows.PopulateColumns() If GridViewWorkflows.Columns.Count > 0 Then - GridViewWorkflows.Columns.Item("PROFILE_ID").Visible = False - GridViewWorkflows.Columns.Item("GUID").Visible = False - Try - GridViewWorkflows.Columns.Item(FullFilepatColName).Visible = False - Catch ex As Exception + COLUMNS_INVISIBLE() - End Try - Try - 'GridViewWorkflows.Columns.Item("DocID").Visible = False - GridViewWorkflows.Columns.Item("TL_STATE").Visible = False - Catch ex As Exception - End Try Try If TL_ICON = True Then @@ -838,7 +860,7 @@ Public Class frmMain Exit Sub End If - FRONTEND_ACTION = "NAVBAR LINK CLICKED" + FRONTEND_ACTION = NAVBAR_CLICKED Dim _tag = e.Link.Item.Tag Timer_Inactivity_Reset_Disable("navBar_LinkClicked") @@ -1075,19 +1097,8 @@ Public Class frmMain RestoreLayout() + COLUMNS_INVISIBLE() - GridViewWorkflows.Columns.Item("PROFILE_ID").Visible = False - GridViewWorkflows.Columns.Item("GUID").Visible = False - Try - GridViewWorkflows.Columns.Item(FullFilepatColName).Visible = False - Catch ex As Exception - End Try - Try - 'GridViewWorkflows.Columns.Item("DocID").Visible = False - GridViewWorkflows.Columns.Item("TL_STATE").Visible = False - Catch ex As Exception - - End Try Try If TL_ICON = True Then GridViewWorkflows.Columns.Item("ICON").MaxWidth = 24 @@ -1100,11 +1111,7 @@ Public Class frmMain End Try - Try - GridViewWorkflows.Columns.Item("CONV_YN").Visible = False - Catch ex As Exception - LOGGER.Info("Create_Basic_View - Check wether Column CONV_YN is part of select/view") - End Try + If IDB_ACTIVE = True Then Try GridViewWorkflows.Columns.Item("CONVERSATION").MaxWidth = 24 @@ -2065,15 +2072,8 @@ Public Class frmMain Try Create_Groups() - GridViewWorkflows.Columns.Item("PROFILE_ID").Visible = False - GridViewWorkflows.Columns.Item("GUID").Visible = False - Try - GridViewWorkflows.Columns.Item(FullFilepatColName).Visible = False - 'GridViewWorkflows.Columns.Item("DocID").Visible = False - GridViewWorkflows.Columns.Item("TL_STATE").Visible = False - Catch ex As Exception + COLUMNS_INVISIBLE() - End Try If TL_ICON = True Then @@ -2088,14 +2088,6 @@ Public Class frmMain End If - Try - If GridViewWorkflows.Columns.Item("CONV_YN") IsNot Nothing Then - GridViewWorkflows.Columns.Item("CONV_YN").Visible = False - - End If - Catch ex As Exception - LOGGER.Info("LoadGridOverview - Check wether Column CONV_YN is part of select/view") - End Try If IDB_ACTIVE = True Then Try GridViewWorkflows.Columns.Item("CONVERSATION").MaxWidth = 24 @@ -2168,6 +2160,7 @@ Public Class frmMain FRONTEND_ACTION = "RESET_LAYOUT" Await Reset_GridLayout(False) Await Decide_Load(False, True) + GridViewWorkflows.OptionsView.ShowViewCaption = False SaveGridLayout() GridBuilder.WithFontSizeDelta(CONFIG.Config.GridFontSizeDelta) If GridControlWorkflows.Visible = True And FormOpenClose = False Then RefreshHelper.LoadViewInfo() @@ -2787,12 +2780,18 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_ Private Sub GridViewWorkflows_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridViewWorkflows.ColumnFilterChanged Try - If FormShown = False Then + If FormShown = False Or FRONTEND_ACTION = NAVBAR_CLICKED Then Exit Sub End If Timer_Inactivity_Reset_Disable("GridViewWorkflows.ColumnFilterChanged") - Create_View_Caption() + If DetailLinkActive = False Then + Create_View_Caption() + End If + + If GridViewWorkflows.ActiveFilterEnabled Then + + End If If Ev_Filter_Panel_Closed = False Then Dim objectCount_Descr As String = S.Filter_aktiv @@ -2994,14 +2993,11 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_ End Sub Sub Grid_Layout_Save() FRONTEND_ACTION = "SAVE GRID LAYOUT" + GridViewWorkflows.OptionsView.ShowViewCaption = False GridLayout_Changed("Grid_Layout_Save") FRONTEND_ACTION = FA_NONE End Sub - Private Async Function BarButtonItem3_ItemClick_2(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) As Tasks.Task Handles BarButtonItem3.ItemClick - Await GridLayout_Reset() - End Function - Private Sub BarButtonItem5_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemExportExcel.ItemClick Grid_Export() End Sub @@ -3290,4 +3286,9 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_ Private Sub GridViewWFItems_Click(sender As Object, e As EventArgs) Handles GridViewWorkflows.Click End Sub + + Private Async Sub BarButtonItem3_ItemClick_2(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemResetLayout.ItemClick + LOGGER.Info("User clicked reset layout") + Await GridLayout_Reset() + End Sub End Class \ No newline at end of file diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index 377cefd..a32bf0e 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -3500,7 +3500,7 @@ Public Class frmValidator If IDB_ACTIVE = True Then Try - Dim oSQL = $"select Attribut, TERM_VALUE from VWIDB_VALUE_TEXT WHERE LANG_CODE = '{USER_LANGUAGE}' AND IDB_OBJ_ID = {CURRENT_DOC_ID} AND Attribut in ('PM_Info1','PM_Info2') ORDER BY Attribut" + Dim oSQL = $"select Attribut, TERM_VALUE from VWIDB_VALUE_TEXT WHERE LANG_CODE IN ('{USER_LANGUAGE}','UNQID') AND IDB_OBJ_ID = {CURRENT_DOC_ID} AND Attribut in ('PM_Info1','PM_Info2') ORDER BY Attribut" Dim oDTINFO As DataTable = DatabaseFallback.GetDatatableIDB(oSQL) If Not IsNothing(oDTINFO) Then Dim oColor As System.Drawing.Color