diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 0c0c35d..4acbe43 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -92,6 +92,7 @@ Partial Class frmMain Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_FILESTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() Me.TimerReminder = New System.Windows.Forms.Timer(Me.components) + Me.GroupToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() CType(Me.SplitContainerDashboard, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerDashboard.Panel1.SuspendLayout() Me.SplitContainerDashboard.Panel2.SuspendLayout() @@ -465,7 +466,7 @@ Partial Class frmMain 'ContextMenuGrid ' Me.ContextMenuGrid.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.ContextMenuGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CMGroupStart, Me.CMFileStart, Me.TabellenlayoutZurücksetzenToolStripMenuItem, Me.tsmiMarkedFilesFinish}) + Me.ContextMenuGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.CMGroupStart, Me.CMFileStart, Me.TabellenlayoutZurücksetzenToolStripMenuItem, Me.tsmiMarkedFilesFinish, Me.GroupToolStripMenuItem}) Me.ContextMenuGrid.Name = "ContextMenuStrip1" resources.ApplyResources(Me.ContextMenuGrid, "ContextMenuGrid") ' @@ -606,6 +607,11 @@ Partial Class frmMain 'TimerReminder ' ' + 'GroupToolStripMenuItem + ' + Me.GroupToolStripMenuItem.Name = "GroupToolStripMenuItem" + resources.ApplyResources(Me.GroupToolStripMenuItem, "GroupToolStripMenuItem") + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -728,4 +734,5 @@ Partial Class frmMain Friend WithEvents BindingNavigatorMoveLastItem As ToolStripButton Friend WithEvents BindingNavigatorSeparator2 As ToolStripSeparator Friend WithEvents bindsourcegrid As BindingSource + Friend WithEvents GroupToolStripMenuItem As ToolStripMenuItem End Class diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 7f89f6e..8611ea9 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -141,7 +141,7 @@ 0, 25 - 257, 234 + 256, 234 @@ -166,7 +166,7 @@ 0, 0 - 257, 25 + 256, 25 1 @@ -205,7 +205,7 @@ 0, 25 - 517, 234 + 518, 234 1 @@ -229,7 +229,7 @@ 0, 0 - 517, 25 + 518, 25 0 @@ -265,7 +265,7 @@ 778, 259 - 257 + 256 0 @@ -307,7 +307,7 @@ 0, 25 - 257, 146 + 256, 146 1 @@ -331,7 +331,7 @@ 0, 0 - 257, 25 + 256, 25 0 @@ -370,7 +370,7 @@ 0, 25 - 517, 146 + 518, 146 1 @@ -394,7 +394,7 @@ 0, 0 - 517, 25 + 518, 25 0 @@ -430,7 +430,7 @@ 778, 171 - 257 + 256 0 @@ -488,7 +488,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAbwBAwG8AQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAcQBAwHEAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -547,30 +547,6 @@ Tahoma, 9pt - - 0, 0 - - - 1023, 27 - - - 2 - - - ToolStrip1 - - - ToolStrip1 - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 4 - Segoe UI, 9pt, style=Bold, Italic @@ -628,36 +604,36 @@ Aktualisieren + + 0, 0 + + + 1023, 27 + + + 2 + + + ToolStrip1 + + + ToolStrip1 + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 4 + 1015, 17 Tahoma, 9pt - - 0, 498 - - - 1023, 29 - - - 3 - - - StatusStrip1 - - - StatusStrip1 - - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - 150, 24 @@ -703,120 +679,33 @@ 0, 24 - - pnlNavigator + + 0, 498 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1023, 29 - - Panel1 - - - 0 - - - GridControl_Docs - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 1 - - - lblViewType - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 2 - - - NavBarControl1 - - - DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - + 3 - - Fill + + StatusStrip1 - - Tahoma, 9pt + + StatusStrip1 - - 0, 0 + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1023, 498 - - - 4 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + $this - - 2 + + 3 - - 1047, 95 - Top, Left, Right - - BindingNavigator1 - - - System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pnlNavigator - - - 0 - - - 242, 45 - - - 778, 25 - - - 10 - - - pnlNavigator - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Panel1 - - - 0 - 1047, 95 @@ -959,45 +848,33 @@ 0 + + 242, 45 + + + 778, 25 + + + 10 + + + pnlNavigator + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 0 + Top, Bottom, Left, Right 152, 95 - - 270, 108 - - - ContextMenuGrid - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 242, 73 - - - Aqua - - - 778, 422 - - - 8 - - - GridControl_Docs - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 1 - 269, 26 @@ -1031,6 +908,45 @@ Massenabschluss markierte Dateien + + 269, 26 + + + Group + + + 270, 156 + + + ContextMenuGrid + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 242, 73 + + + Aqua + + + 777, 439 + + + 8 + + + GridControl_Docs + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel1 + + + 1 + True @@ -1116,6 +1032,12 @@ 301, 95 + + 219, 26 + + + Starte Validierung für Profil + 220, 30 @@ -1313,11 +1235,32 @@ 3 - - 219, 26 + + Fill - - Starte Validierung für Profil + + Tahoma, 9pt + + + 0, 0 + + + 1023, 498 + + + 4 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 1132, 17 @@ -1987,6 +1930,12 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GroupToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + frmMain diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index d8f8ec9..19917d9 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -740,7 +740,7 @@ Public Class frmMain Load_Profile_items() Decide_Load() tsslblLastSysnc.Text = "Letzte Synchronisation: " & Now.ToLongTimeString - RestoreLayout() + End Sub Private Sub NotifyIcon1_Click(sender As System.Object, e As System.EventArgs) Handles NotifyIcon1.Click @@ -1079,6 +1079,13 @@ Public Class frmMain ' "WHERE T.PROFIL_ID = T1.PROFIL_ID " & ' "AND T1.ACTIVE = 1 And (UPPER(T1.USERNAME) = UPPER('{0}')) Order By T1.PRIORITY", Environment.UserName) CURR_DT_PROFILEGRID = ClassDatabase.Return_Datatable(sql, True) + Dim DTGRID_GROUPS As DataTable + Try + DTGRID_GROUPS = ClassDatabase.Return_Datatable($"SELECT * FROM TBPM_MAIN_VIEW_GROUPS WHERE ACTIVE = 1", True) + Catch ex As Exception + ClassLogger.Add(ex.Message) + End Try + If Not IsNothing(CURR_DT_PROFILEGRID) Then NO_WORKFLOWITEMS = False @@ -1139,12 +1146,25 @@ Public Class frmMain Try GridView_Docs.OptionsBehavior.AutoExpandAllGroups = True GridView_Docs.OptionsView.ShowGroupedColumns = False + GridView_Docs.OptionsView.ShowGroupPanel = False + Dim oindex As Integer = 0 + If Not IsNothing(DTGRID_GROUPS) Then + For Each oGridGroup As DataRow In DTGRID_GROUPS.Rows + If LogErrorsOnly = False Then ClassLogger.Add($" >> Addig group [{oGridGroup.Item("GROUPNAME")}] for Grid...", False) + GridView_Docs.Columns.Item(oGridGroup.Item("GROUPNAME")).GroupIndex = oindex + oindex += 1 + Next + Else + GridView_Docs.Columns.Item("PROFILE_GROUP_TEXT").GroupIndex = oindex + End If + + - GridView_Docs.Columns.Item("PROFILE_GROUP_TEXT").GroupIndex = 0 GridView_Docs.Columns.Item("PROFILE_GROUP_TEXT").Visible = False GridView_Docs.Columns.Item("PROFILE_GROUP_COLOR").Visible = False For index = 0 To GridView_Docs.GroupCount - 1 Dim v = GridView_Docs.GroupedColumns(index).ToString + If LogErrorsOnly = False Then ClassLogger.Add($" >> Addig tag [{GridView_Docs.Columns.Item("PROFILE_ID")}] for group...", False) GridView_Docs.GroupedColumns(index).Tag = GridView_Docs.Columns.Item("PROFILE_ID") Next @@ -1352,4 +1372,12 @@ Public Class frmMain GridViewItem_Clicked = Nothing End If End Sub + + Private Sub GroupToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles GroupToolStripMenuItem.Click + If GridView_Docs.OptionsView.ShowGroupedColumns = True Then + GridView_Docs.OptionsView.ShowGroupedColumns = False + Else + GridView_Docs.OptionsView.ShowGroupedColumns = True + End If + End Sub End Class \ No newline at end of file