diff --git a/app/DD_PM_WINDREAM/App.config b/app/DD_PM_WINDREAM/App.config
index 5d95c6d..f243461 100644
--- a/app/DD_PM_WINDREAM/App.config
+++ b/app/DD_PM_WINDREAM/App.config
@@ -15,7 +15,7 @@
False
- DEV
+ TEST
diff --git a/app/DD_PM_WINDREAM/ClassParamRefresh.vb b/app/DD_PM_WINDREAM/ClassParamRefresh.vb
index 27941dc..9d3e813 100644
--- a/app/DD_PM_WINDREAM/ClassParamRefresh.vb
+++ b/app/DD_PM_WINDREAM/ClassParamRefresh.vb
@@ -181,6 +181,7 @@ Public Class ClassParamRefresh
Dim oAfterReplace = oMode.Replace("PM.START_CW=", "")
Try
START_CW = True
+ LOGGER.Debug("PM.START_CW = True")
Dim oSplit As String() = oAfterReplace.Split("~")
START_CW_CAPTION = oSplit(0)
Try
diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb
index e7c3688..dc202ed 100644
--- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb
+++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
'
-
+
diff --git a/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb b/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb
index c20f665..0355eef 100644
--- a/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb
+++ b/app/DD_PM_WINDREAM/My Project/Settings.Designer.vb
@@ -300,7 +300,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/DD_PM_WINDREAM/My Project/Settings.settings b/app/DD_PM_WINDREAM/My Project/Settings.settings
index d2103a0..00aa215 100644
--- a/app/DD_PM_WINDREAM/My Project/Settings.settings
+++ b/app/DD_PM_WINDREAM/My Project/Settings.settings
@@ -68,7 +68,7 @@
False
- DEV
+ TEST
\ No newline at end of file
diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx
index 66a6730..1ae2fd1 100644
--- a/app/DD_PM_WINDREAM/frmMain.resx
+++ b/app/DD_PM_WINDREAM/frmMain.resx
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
- CAAAAk1TRnQBSQFMAgEBAgEAAbQBCAG0AQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ CAAAAk1TRnQBSQFMAgEBAgEAAcQBCAHEAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb
index 1e8756a..dca3031 100644
--- a/app/DD_PM_WINDREAM/frmMain.vb
+++ b/app/DD_PM_WINDREAM/frmMain.vb
@@ -49,6 +49,7 @@ Public Class frmMain
Private IsFilterMode As Boolean
Private DetailLinkActive As Boolean = False
Private FRONTEND_ACTION As String = "NONE"
+ Private Ev_Filter_Panel_Closed As Boolean = False
Private Function GET_LAST_ADDED(pDatatable As DataTable) As String
Dim oADDED As String
Try
@@ -531,7 +532,7 @@ Public Class frmMain
- Private Function GetXML_OverviewLayoutName()
+ Private Function GetXML_LayoutName()
Dim Filename As String = String.Format("DevExpressGridViewOverview_UserLayout_{0}.xml", GRID_LOAD_TYPE)
Return System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
End Function
@@ -542,9 +543,8 @@ Public Class frmMain
Exit Sub
End If
-
Try
- Dim xml As String = GetXML_OverviewLayoutName()
+ Dim xml As String = GetXML_LayoutName()
GridViewWFItems.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
Catch ex As Exception
LOGGER.Error(ex)
@@ -558,7 +558,7 @@ Public Class frmMain
End If
Try
- Dim oXml As String = GetXML_OverviewLayoutName()
+ Dim oXml As String = GetXML_LayoutName()
GridViewWFItems.RestoreLayoutFromXml(oXml, OptionsLayoutBase.FullLayout)
Catch ex As Exception
LOGGER.Error(ex)
@@ -569,7 +569,7 @@ Public Class frmMain
Private Sub ResetLayout()
Try
Timer_Inactivity_Reset_Disable("ResetLayout")
- Dim xml As String = GetXML_OverviewLayoutName()
+ Dim xml As String = GetXML_LayoutName()
IO.File.Delete(xml)
Try
GridViewWFItems.Columns.Clear()
@@ -742,8 +742,10 @@ Public Class frmMain
End Sub
Private Async Sub navBar_LinkClicked(ByVal sender As Object, ByVal e As NavBarLinkEventArgs)
- If GRID_LOAD_TYPE = "OVERVIEW" Then
- 'SaveGridLayout()
+ If Not Application.OpenForms().OfType(Of frmValidator).Any Then
+ Else
+ MsgBox("Please close the active workflow!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE)
+ Exit Sub
End If
FRONTEND_ACTION = "NAVBAR LINK CLICKED"
@@ -760,6 +762,9 @@ Public Class frmMain
If Not Application.OpenForms().OfType(Of frmValidator).Any Then
CURRENT_CLICKED_PROFILE_ID = _tag
CURRENT_CLICKED_PROFILE_TITLE = e.Link.Item.Caption
+ Else
+ MsgBox("Please close the active workflow!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE)
+ Exit Sub
End If
@@ -790,6 +795,13 @@ Public Class frmMain
GridViewWFItems.HideLoadingPanel()
TimerRefresh.Start()
RefreshHelper.LoadViewInfo()
+ If GridViewWFItems.GroupCount = 0 And IsNothing(GridViewWFItems.Columns("GROUP_TEXT")) Then
+ LOGGER.Info("NO GROUPS AFTER CLICK OVERVIEW...CREATING GROUPS NEW...")
+ Await Load_Grid_Overview(False, True)
+ GridViewWFItems.HideLoadingPanel()
+ TimerRefresh.Start()
+ RefreshHelper.LoadViewInfo()
+ End If
End If
End If
@@ -809,7 +821,7 @@ Public Class frmMain
Return False
End Try
End Function
- Sub Layout_Single_Profile()
+ Sub GridControl_Docs_Visible()
Try
If GridControl_Docs.Visible = False Then
@@ -824,7 +836,7 @@ Public Class frmMain
Try
FRONTEND_ACTION = "Load_single_Profile"
Load_Profiles_for_User()
- Layout_Single_Profile()
+ GridControl_Docs_Visible()
Dim expression As String
expression = "GUID = " & CURRENT_CLICKED_PROFILE_ID
Dim TEMP_TABLE = CURR_DT_VWPM_PROFILE_ACTIVE
@@ -1096,7 +1108,7 @@ Public Class frmMain
Private Function Column_inGridViewLayout(Col2bChecked As String) As Boolean
Try
Dim oGridView As New GridView
- Dim oXml As String = GetXML_OverviewLayoutName()
+ Dim oXml As String = GetXML_LayoutName()
oGridView.RestoreLayoutFromXml(oXml, OptionsLayoutBase.FullLayout)
Dim oViewColumn_exists As Boolean = False
For Each oActGridColumn As GridColumn In oGridView.Columns
@@ -1411,8 +1423,6 @@ Public Class frmMain
' Dim frmA = New frmValidator() ' Must be created on this thread!
' Application.Run(frmA)
'End Sub
-
-
Private Sub Item_Scope(startedFrom As String)
Try
@@ -1708,10 +1718,43 @@ Public Class frmMain
Return False
End Try
End Function
+ Private Sub Create_Groups()
+ Try
+ LOGGER.Debug("Now Working on Groups..")
+ GridViewWFItems.OptionsView.ShowGroupPanel = False
+ Dim oindex As Integer = 0
+ If Not IsNothing(BASEDATA_DTGRID_GROUPS) Then
+ For Each oGridGroup As DataRow In BASEDATA_DTGRID_GROUPS.Rows
+ LOGGER.Debug($"Adding group [{oGridGroup.Item("GROUPNAME")}] for Grid...")
+ Try
+ GridViewWFItems.Columns.Item(oGridGroup.Item("GROUPNAME")).GroupIndex = oindex
+ Catch ex As Exception
+ End Try
+
+ oindex += 1
+ Next
+ End If
+
+ Try
+ GridViewWFItems.Columns.Item("GROUP_TEXT").Visible = False
+ GridViewWFItems.Columns.Item("GROUP_COLOR").Visible = False
+ Catch ex As Exception
+ End Try
+ For index = 0 To GridViewWFItems.GroupCount - 1
+ 'Dim v = GridView_Docs.GroupedColumns(index).ToString
+ LOGGER.Debug($"Adding tag [{GridViewWFItems.Columns.Item("PROFILE_ID")}] for group...")
+ Dim sd = GridViewWFItems.GroupedColumns(index).GetTextCaption
+ GridViewWFItems.GroupedColumns(index).Tag = GridViewWFItems.Columns.Item("PROFILE_ID")
+ Next
+ LOGGER.Debug("finished Grouping!")
+ Catch ex As Exception
+ LOGGER.Error(ex)
+ End Try
+ End Sub
Async Function Load_Grid_Overview(FormLoad As Boolean, Optional ForceReload As Boolean = False) As Tasks.Task
Dim oStopWatch As New RefreshHelper.SW("Load_Grid_Overview(LGO)")
- Layout_Single_Profile()
+ GridControl_Docs_Visible()
GRID_LOAD_TYPE = "OVERVIEW"
CURRENT_CLICKED_PROFILE_ID = 0
@@ -1741,6 +1784,23 @@ Public Class frmMain
oStopWatch2.Done()
Exit Function
End If
+ If oSQLOverview.ToString.Contains("GROUP_TEXT") = False Then
+ MsgBox("Incomplete Overview-Source (No Group-Columns). Please reload manually!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE)
+ NO_WORKFLOWITEMS = True
+
+ 'MsgBox("Aktuell keine Workflowdaten vorhanden!", MsgBoxStyle.Information)
+ GridControl_Docs.Visible = False
+ bindsourcegrid.DataSource = Nothing
+ GridControl_Docs.DataSource = Nothing
+ Try
+ GridViewWFItems.Columns.Clear()
+ Catch ex As Exception
+ LOGGER.Error(ex)
+
+ End Try
+
+ Exit Function
+ End If
oSQLOverview = clsPatterns.ReplaceInternalValues(oSQLOverview)
oSQLOverview = clsPatterns.ReplaceUserValues(oSQLOverview)
@@ -1777,11 +1837,7 @@ Public Class frmMain
OVERVIEW_CHANGED_WHEN = oChanged
OVERVIEW_COUNT = oCOUNT
End If
- If USER_LANGUAGE = "de-DE" Then
- GridViewWFItems.ViewCaption = "Gesamtübersicht"
- Else
- GridViewWFItems.ViewCaption = "Overview"
- End If
+ Create_View_Caption()
NO_WORKFLOWITEMS = False
If CURR_DT_OVERVIEW.Rows.Count = 0 Then
If USER_LANGUAGE = "de-DE" Then
@@ -1871,15 +1927,15 @@ Public Class frmMain
bindsourcegrid.DataSource = CURR_DT_OVERVIEW
GridControl_Docs.DataSource = bindsourcegrid
- Dim objectCount_Descr = GridViewWFItems.RowCount.ToString
- If USER_LANGUAGE = "de-DE" Then
- GridViewWFItems.ViewCaption = "Gesamtübersicht"
- objectCount_Descr &= " Vorgänge"
- Else
- GridViewWFItems.ViewCaption = "Overview"
- objectCount_Descr &= " objects"
- End If
-
+ 'Dim objectCount_Descr = GridViewWFItems.RowCount.ToString
+ 'If USER_LANGUAGE = "de-DE" Then
+ ' GridViewWFItems.ViewCaption = "Gesamtübersicht"
+ ' objectCount_Descr &= " Vorgänge"
+ 'Else
+ ' GridViewWFItems.ViewCaption = "Overview"
+ ' objectCount_Descr &= " objects"
+ 'End If
+ Create_View_Caption()
' tslblObjectCount.Text = objectCount_Descr
'tslblObjectCount.ForeColor = Color.DarkBlue
Dim oColNotPartofLayout As Boolean
@@ -1901,36 +1957,7 @@ Public Class frmMain
End If
Try
- LOGGER.Debug("Now Working on Groups..")
- 'GridView_Docs.OptionsBehavior.AutoExpandAllGroups = False
- 'GridView_Docs.OptionsView.ShowGroupedColumns = False
- GridViewWFItems.OptionsView.ShowGroupPanel = False
- Dim oindex As Integer = 0
- If Not IsNothing(BASEDATA_DTGRID_GROUPS) Then
- For Each oGridGroup As DataRow In BASEDATA_DTGRID_GROUPS.Rows
- LOGGER.Debug($"Addig group [{oGridGroup.Item("GROUPNAME")}] for Grid...")
- Try
- GridViewWFItems.Columns.Item(oGridGroup.Item("GROUPNAME")).GroupIndex = oindex
- Catch ex As Exception
-
- End Try
-
- oindex += 1
- Next
- End If
-
- Try
- GridViewWFItems.Columns.Item("GROUP_TEXT").Visible = False
- GridViewWFItems.Columns.Item("GROUP_COLOR").Visible = False
- Catch ex As Exception
- End Try
- For index = 0 To GridViewWFItems.GroupCount - 1
- 'Dim v = GridView_Docs.GroupedColumns(index).ToString
- LOGGER.Debug($"Addig tag [{GridViewWFItems.Columns.Item("PROFILE_ID")}] for group...")
- Dim sd = GridViewWFItems.GroupedColumns(index).GetTextCaption
- GridViewWFItems.GroupedColumns(index).Tag = GridViewWFItems.Columns.Item("PROFILE_ID")
- Next
- LOGGER.Debug("finished Grouping!")
+ Create_Groups()
GridViewWFItems.Columns.Item("PROFILE_ID").Visible = False
GridViewWFItems.Columns.Item("GUID").Visible = False
Try
@@ -2162,6 +2189,10 @@ Public Class frmMain
Else
GridViewItem_Clicked = Nothing
+ If hi.HitTest = GridHitTest.FilterPanelCloseButton Then
+ Ev_Filter_Panel_Closed = True
+ Grid_Reset_Filter()
+ End If
End If
If Not IsNothing(CURRENT_CLICKED_PROFILE_ID) Then
If IsNumeric(CURRENT_CLICKED_PROFILE_ID) Then
@@ -2596,31 +2627,46 @@ Public Class frmMain
End Sub
Private Sub GridView_Docs_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridViewWFItems.ColumnFilterChanged
-
Try
If FormShown = False Then
Exit Sub
End If
+
Timer_Inactivity_Reset_Disable("GridView_Docs.ColumnFilterChanged")
- Dim objectCount_Descr = GridViewWFItems.RowCount.ToString
- If USER_LANGUAGE <> "de-DE" Then
- objectCount_Descr &= " objects (filtered)"
+ Create_View_Caption()
+ If Ev_Filter_Panel_Closed = False Then
+ Dim objectCount_Descr As String ' = GridViewWFItems.RowCount.ToString
+ If USER_LANGUAGE <> "de-DE" Then
+ objectCount_Descr = " filtered"
+ Else
+ objectCount_Descr = " Filter aktiv"
+ End If
+ GridViewWFItems.ViewCaption += $"|{objectCount_Descr}"
Else
- objectCount_Descr &= " Vorgänge (gefiltert)"
+ Ev_Filter_Panel_Closed = False
End If
- If USER_LANGUAGE = "de-DE" Then
- GridViewWFItems.ViewCaption = "Gesamtübersicht"
- Else
- GridViewWFItems.ViewCaption = "Overview"
+ If GridViewWFItems.ActiveFilterEnabled Then
+
End If
- GridViewWFItems.ViewCaption += $"|{objectCount_Descr}"
SaveGridLayout()
Catch ex As Exception
LOGGER.Error(ex.Message)
End Try
End Sub
+ Sub Create_View_Caption()
+ Try
+ If USER_LANGUAGE = "de-DE" Then
+ GridViewWFItems.ViewCaption = "Gesamtübersicht"
+ Else
+ GridViewWFItems.ViewCaption = "Overview"
+ End If
+
+ Catch ex As Exception
+
+ End Try
+ End Sub
Sub Grid_Export()
XtraSaveFileDialog1.FileName = "Overview.xlsx"
XtraSaveFileDialog1.DefaultExt = ".xlsx"
@@ -2959,4 +3005,8 @@ Public Class frmMain
End Try
End Sub
+
+ Private Sub GridViewWFItems_SubstituteFilter(sender As Object, e As DevExpress.Data.SubstituteFilterEventArgs) Handles GridViewWFItems.SubstituteFilter
+
+ End Sub
End Class
\ No newline at end of file