AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '2.6.0-Release' into 2.7.0-Release

Browse Source
This commit is contained in:
Developer01 2025-10-22 08:36:34 +02:00
commit 5d69edab9f
1 changed files with 64 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
app/TaskFlow/frmMain.vb
View File

@ -2242,50 +2242,84 @@ Public Class frmMain
Item_Scope("DOUBLECLICK")
End Sub
'Private Sub GridViewWorkflows_CustomDrawGroupRow(sender As Object, e As Views.Base.RowObjectCustomDrawEventArgs) Handles GridViewWorkflows.CustomDrawGroupRow
' Try
' ' Added
' If FormOpenClose = True And GridIsLoaded = False Then
' Exit Sub
' End If
' Dim info As GridGroupRowInfo = TryCast(e.Info, GridGroupRowInfo)
' Dim view As GridView = sender
' If info.Column.FieldName = "GROUP_TEXT" Then
' info.GroupText = info.GroupValueText
' Dim oColorString As String = "LightGray"
' Dim oFontColorString As String = "Black"
' Dim oFoundConfig As Boolean = False
' Dim oGROUP_TEXT_COL As String
' If USER_LANGUAGE = "de-DE" Then
' oGROUP_TEXT_COL = "GROUP_TEXT"
' Else
' oGROUP_TEXT_COL = "GROUP_TEXT_LANG"
' End If
' For Each oProfileRow As DataRow In CURR_DT_VWPM_PROFILE_ACTIVE.Rows
' If oProfileRow.Item(oGROUP_TEXT_COL) = info.GroupValueText Then
' oFoundConfig = True
' oColorString = oProfileRow.Item("GROUP_COLOR")
' oFontColorString = oProfileRow.Item("GROUP_FONT_COLOR")
' ' Added
' Exit For
' End If
' Next
' If oFoundConfig = False Then
' LOGGER.Info($"CustomDrawGroupRow: Could not find a ColorConfig for ProfileGroupValueText [{info.GroupValueText}]...")
' ' Added
' Exit Sub
' End If
' Dim oColor As Color = ParseColorString(oColorString, Color.LightGray, "Background Color")
' Dim oFontColor As Color = ParseColorString(oFontColorString, Color.Black, "Font Color")
' info.Appearance.BackColor = oColor
' info.Appearance.ForeColor = oFontColor
' End If
' Catch ex As Exception
' LOGGER.Error(ex)
' End Try
'End Sub
Private Sub GridViewWorkflows_CustomDrawGroupRow(sender As Object, e As Views.Base.RowObjectCustomDrawEventArgs) Handles GridViewWorkflows.CustomDrawGroupRow
Try
' Added
If FormOpenClose = True And GridIsLoaded = False Then
Exit Sub
End If
Dim info As GridGroupRowInfo = TryCast(e.Info, GridGroupRowInfo)
Dim view As GridView = sender
Dim oInfo As GridGroupRowInfo = TryCast(e.Info, GridGroupRowInfo)
If oInfo Is Nothing OrElse oInfo.Column Is Nothing Then
Exit Sub
End If
If info.Column.FieldName = "GROUP_TEXT" Then
info.GroupText = info.GroupValueText
Dim oView As GridView = sender
If oInfo.Column.FieldName = "GROUP_TEXT" Then
oInfo.GroupText = oInfo.GroupValueText
Dim oColorString As String = "LightGray"
Dim oFontColorString As String = "Black"
Dim oFoundConfig As Boolean = False
Dim oGROUP_TEXT_COL As String
If USER_LANGUAGE = "de-DE" Then
oGROUP_TEXT_COL = "GROUP_TEXT"
Else
oGROUP_TEXT_COL = "GROUP_TEXT_LANG"
End If
Dim oChildRowHandle As Integer = oView.GetChildRowHandle(oInfo.RowHandle, 0)
For Each oProfileRow As DataRow In CURR_DT_VWPM_PROFILE_ACTIVE.Rows
If oProfileRow.Item(oGROUP_TEXT_COL) = info.GroupValueText Then
oFoundConfig = True
oColorString = oProfileRow.Item("GROUP_COLOR")
oFontColorString = oProfileRow.Item("GROUP_FONT_COLOR")
' Added
Exit For
End If
Next
If oFoundConfig = False Then
LOGGER.Info($"CustomDrawGroupRow: Could not find a ColorConfig for ProfileGroupValueText [{info.GroupValueText}]...")
' Added
Exit Sub
End If
oColorString = oView.GetRowCellValue(oChildRowHandle, "GROUP_COLOR")
Dim oColor As Color = ParseColorString(oColorString, Color.LightGray, "Background Color")
Dim oFontColor As Color = ParseColorString(oFontColorString, Color.Black, "Font Color")
info.Appearance.BackColor = oColor
info.Appearance.ForeColor = oFontColor
oInfo.Appearance.BackColor = oColor
oInfo.Appearance.ForeColor = oFontColor
End If
Catch ex As Exception
LOGGER.Error(ex)
@ -3258,7 +3292,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, True)
Dim oResult = WINDREAM_MOD.NewFileStream(oSourcePath, oTargetPath, oWMObjecttype)
If oResult = True Then
WM_AHWF_docPath = oTargetPath
Dim oDocID = WINDREAM_MOD.NewDocumentID