Ms merge

app/TaskFlow/frmMain.vb

@@ -1,24 +1,25 @@
-Imports System.Globalization
-Imports DevExpress.Utils
-Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
-Imports DevExpress.XtraGrid.Views.Grid
-Imports DevExpress.XtraGrid
-Imports DevExpress.XtraNavBar
-Imports DevExpress.XtraGrid.Columns
-Imports System.Threading
-Imports System.ComponentModel
+Imports System.ComponentModel
+Imports System.Globalization
 Imports System.IO
-Imports DevExpress.XtraPrinting
-Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
-Imports DigitalData.Modules.EDMI.API.Constants
-Imports DigitalData.Modules.Windream
-Imports DigitalData.GUIs.Common
-Imports DevExpress.XtraGrid.Views.BandedGrid
-Imports DevExpress.XtraBars.Ribbon
-Imports DigitalData.Modules.ZooFlow
+Imports System.Threading
 Imports DevExpress.LookAndFeel
-Imports DigitalData.Modules.Base
+Imports DevExpress.Utils
+Imports DevExpress.XtraBars.Ribbon
+Imports DevExpress.XtraExport.Helpers
+Imports DevExpress.XtraGrid
+Imports DevExpress.XtraGrid.Columns
+Imports DevExpress.XtraGrid.Views.BandedGrid
 Imports DevExpress.XtraGrid.Views.Base
+Imports DevExpress.XtraGrid.Views.Grid
+Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
+Imports DevExpress.XtraNavBar
+Imports DevExpress.XtraPrinting
+Imports DigitalData.GUIs.Common
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.EDMI.API.Constants
+Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
+Imports DigitalData.Modules.Windream
+Imports DigitalData.Modules.ZooFlow
 
 Public Class frmMain
     Private Property FormHelper As FormHelper
@@ -1404,8 +1405,8 @@ Public Class frmMain
                 cultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
                 Thread.CurrentThread.CurrentCulture = cultureInfo
                 Thread.CurrentThread.CurrentUICulture = cultureInfo
-                cultureInfo.DefaultThreadCurrentCulture = cultureInfo
-                cultureInfo.DefaultThreadCurrentUICulture = cultureInfo
+                CultureInfo.DefaultThreadCurrentCulture = cultureInfo
+                CultureInfo.DefaultThreadCurrentUICulture = cultureInfo
             End If
         Catch ex As Exception
             LOGGER.Error(ex)
@@ -2159,12 +2160,10 @@ Public Class frmMain
             RestoreLayout()
 
             Try
-                Dim oSQLFormat = "SELECT * FROM TBDD_COLUMNS_FORMAT WHERE MODULE = 'taskFLOW' AND GRIDVIEW = 'GridViewWorkflows'"
-                Dim dtColFormat As DataTable = Await DatabaseFallback.GetDatatableECMAsync(oSQLFormat)
 
                 For Each oColumn As DevExpress.XtraGrid.Columns.GridColumn In GridViewWorkflows.Columns
 
-                    For Each oRow As DataRow In dtColFormat.Rows
+                    For Each oRow As DataRow In BASEDATA_TBDD_COLUMNS_FORMAT.Rows
                         Dim colName = oRow("COLUMN_TITLE").ToString()
 
                         If oColumn.FieldName = colName Then
@@ -2179,7 +2178,10 @@ Public Class frmMain
                                 If oColumn.ColumnType = GetType(DateTime) And oColumn.DisplayFormat.FormatString <> "dd.MM.yyyy HH:mm:ss" Then
                                     oColumn.DisplayFormat.FormatString = "dd.MM.yyyy HH:mm:ss"
                                 End If
-
+                            ElseIf oSollFormatType = "Numeric" Then
+                                If oColumn.ColumnType <> GetType(Int32) Then
+                                    oColumn.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric
+                                End If
                             End If
                         End If
                     Next
@@ -2888,13 +2890,17 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
 
             End If
             If Ev_Filter_Panel_Closed = False Then
-                Dim oTermFilterActive As String = S.Filter_aktiv
+                Dim oTermFilterActive As String = String.Format("{0} ({1})", S.Filter_aktiv, GridViewWorkflows.RowCount)
                 If GridViewWorkflows.ActiveFilterString <> String.Empty Then
                     If Not lblCaptionMainGrid.Text.Contains(oTermFilterActive) Then
                         lblCaptionMainGrid.Text += $"|{oTermFilterActive}"
                     Else
                         Ev_Filter_Panel_Closed = False
                     End If
+                    bsitmCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+                    bsitmCount.Caption = oTermFilterActive
+                Else
+                    bsitmCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
                 End If
 
             End If
@@ -3260,6 +3266,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
 
     Private Sub GridViewWFItems_SubstituteFilter(sender As Object, e As DevExpress.Data.SubstituteFilterEventArgs) Handles GridViewWorkflows.SubstituteFilter
         GridLayout_Changed("GridViewWFItems_SubstituteFilter")
+
     End Sub
 
     Private Sub BbtnitmAHWF1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BbtnitmAHWF1.ItemClick, BbtnitmAHWF2.ItemClick, BbtnitmAHWF3.ItemClick, BbtnitmAHWF4.ItemClick
@@ -3292,7 +3299,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
 
                     LOGGER.Debug($"oTargetPath with NowParams: {oTargetPath}")
 
-                    Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype)
+                    Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype, True)
                     If oResult = True Then
                         WM_AHWF_docPath = oTargetPath
                         Dim oDocID = WINDREAM_MOD.NewDocumentID