Compare commits
3 Commits
4807ab53b0
...
2.6.0-Rele
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
544f710083 | ||
|
|
468f6e8ff0 | ||
|
|
c577177493 |
23
app/TaskFlow/frmFormDesigner.Designer.vb
generated
23
app/TaskFlow/frmFormDesigner.Designer.vb
generated
@@ -49,6 +49,8 @@ Partial Class frmFormDesigner
|
|||||||
Me.bbtniheight_plus = New DevExpress.XtraBars.BarButtonItem()
|
Me.bbtniheight_plus = New DevExpress.XtraBars.BarButtonItem()
|
||||||
Me.bbtniheight_min = New DevExpress.XtraBars.BarButtonItem()
|
Me.bbtniheight_min = New DevExpress.XtraBars.BarButtonItem()
|
||||||
Me.tslblAenderungen = New DevExpress.XtraBars.BarStaticItem()
|
Me.tslblAenderungen = New DevExpress.XtraBars.BarStaticItem()
|
||||||
|
Me.BarStaticItem2 = New DevExpress.XtraBars.BarStaticItem()
|
||||||
|
Me.bsitmProfilID = New DevExpress.XtraBars.BarStaticItem()
|
||||||
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||||
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||||
Me.RibbonGroupControlFunctions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
Me.RibbonGroupControlFunctions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||||
@@ -125,9 +127,9 @@ Partial Class frmFormDesigner
|
|||||||
'RibbonControl1
|
'RibbonControl1
|
||||||
'
|
'
|
||||||
Me.RibbonControl1.ExpandCollapseItem.Id = 0
|
Me.RibbonControl1.ExpandCollapseItem.Id = 0
|
||||||
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnItemFinishSQL, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1, Me.BarButtonItem4, Me.BarButtonItem5, Me.bbtnitLabel, Me.bbtnitTextBox, Me.bbtnitLU, Me.bbtnitTable, Me.bbtnitDatePicker, Me.bbtnitCheckBox, Me.bbtnitButton, Me.bbtnitLine, Me.bbtniwidth_plus, Me.bbtniwidth_min, Me.bbtniheight_plus, Me.bbtniheight_min, Me.tslblAenderungen})
|
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnItemFinishSQL, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1, Me.BarButtonItem4, Me.BarButtonItem5, Me.bbtnitLabel, Me.bbtnitTextBox, Me.bbtnitLU, Me.bbtnitTable, Me.bbtnitDatePicker, Me.bbtnitCheckBox, Me.bbtnitButton, Me.bbtnitLine, Me.bbtniwidth_plus, Me.bbtniwidth_min, Me.bbtniheight_plus, Me.bbtniheight_min, Me.tslblAenderungen, Me.BarStaticItem2, Me.bsitmProfilID})
|
||||||
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
|
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
|
||||||
Me.RibbonControl1.MaxItemId = 21
|
Me.RibbonControl1.MaxItemId = 23
|
||||||
Me.RibbonControl1.Name = "RibbonControl1"
|
Me.RibbonControl1.Name = "RibbonControl1"
|
||||||
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
|
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
|
||||||
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
|
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
|
||||||
@@ -283,6 +285,20 @@ Partial Class frmFormDesigner
|
|||||||
Me.tslblAenderungen.Name = "tslblAenderungen"
|
Me.tslblAenderungen.Name = "tslblAenderungen"
|
||||||
Me.tslblAenderungen.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
|
Me.tslblAenderungen.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
|
||||||
'
|
'
|
||||||
|
'BarStaticItem2
|
||||||
|
'
|
||||||
|
resources.ApplyResources(Me.BarStaticItem2, "BarStaticItem2")
|
||||||
|
Me.BarStaticItem2.Id = 21
|
||||||
|
Me.BarStaticItem2.Name = "BarStaticItem2"
|
||||||
|
'
|
||||||
|
'bsitmProfilID
|
||||||
|
'
|
||||||
|
resources.ApplyResources(Me.bsitmProfilID, "bsitmProfilID")
|
||||||
|
Me.bsitmProfilID.Id = 22
|
||||||
|
Me.bsitmProfilID.ItemAppearance.Normal.Font = CType(resources.GetObject("bsitmProfilID.ItemAppearance.Normal.Font"), System.Drawing.Font)
|
||||||
|
Me.bsitmProfilID.ItemAppearance.Normal.Options.UseFont = True
|
||||||
|
Me.bsitmProfilID.Name = "bsitmProfilID"
|
||||||
|
'
|
||||||
'RibbonPage1
|
'RibbonPage1
|
||||||
'
|
'
|
||||||
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonGroupControlFunctions, Me.RibbonGroupControls, Me.RibPGCtrlWidth, Me.RibPGCtrlheight})
|
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonGroupControlFunctions, Me.RibbonGroupControls, Me.RibPGCtrlWidth, Me.RibPGCtrlheight})
|
||||||
@@ -332,6 +348,7 @@ Partial Class frmFormDesigner
|
|||||||
'
|
'
|
||||||
'RibbonStatusBar1
|
'RibbonStatusBar1
|
||||||
'
|
'
|
||||||
|
Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmProfilID)
|
||||||
Me.RibbonStatusBar1.ItemLinks.Add(Me.tslblAenderungen)
|
Me.RibbonStatusBar1.ItemLinks.Add(Me.tslblAenderungen)
|
||||||
resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
|
resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
|
||||||
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
|
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
|
||||||
@@ -508,4 +525,6 @@ Partial Class frmFormDesigner
|
|||||||
Friend WithEvents pnldesigner As DigitalData.Controls.SnapPanel.ClassSnapPanel
|
Friend WithEvents pnldesigner As DigitalData.Controls.SnapPanel.ClassSnapPanel
|
||||||
Friend WithEvents tslblAenderungen As DevExpress.XtraBars.BarStaticItem
|
Friend WithEvents tslblAenderungen As DevExpress.XtraBars.BarStaticItem
|
||||||
Friend WithEvents pgControlsNew As DevExpress.XtraVerticalGrid.PropertyGridControl
|
Friend WithEvents pgControlsNew As DevExpress.XtraVerticalGrid.PropertyGridControl
|
||||||
|
Friend WithEvents BarStaticItem2 As DevExpress.XtraBars.BarStaticItem
|
||||||
|
Friend WithEvents bsitmProfilID As DevExpress.XtraBars.BarStaticItem
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
@@ -421,6 +421,15 @@
|
|||||||
<data name="tslblAenderungen.Caption" xml:space="preserve">
|
<data name="tslblAenderungen.Caption" xml:space="preserve">
|
||||||
<value>Noch keine Änderungen</value>
|
<value>Noch keine Änderungen</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="BarStaticItem2.Caption" xml:space="preserve">
|
||||||
|
<value>BarStaticItem2</value>
|
||||||
|
</data>
|
||||||
|
<data name="bsitmProfilID.Caption" xml:space="preserve">
|
||||||
|
<value>ProfilID: </value>
|
||||||
|
</data>
|
||||||
|
<data name="bsitmProfilID.ItemAppearance.Normal.Font" type="System.Drawing.Font, System.Drawing">
|
||||||
|
<value>Microsoft Sans Serif, 8.25pt, style=Bold</value>
|
||||||
|
</data>
|
||||||
<data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>0, 0</value>
|
<value>0, 0</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -1179,6 +1188,18 @@
|
|||||||
<data name=">>tslblAenderungen.Type" xml:space="preserve">
|
<data name=">>tslblAenderungen.Type" xml:space="preserve">
|
||||||
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name=">>BarStaticItem2.Name" xml:space="preserve">
|
||||||
|
<value>BarStaticItem2</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>BarStaticItem2.Type" xml:space="preserve">
|
||||||
|
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>bsitmProfilID.Name" xml:space="preserve">
|
||||||
|
<value>bsitmProfilID</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>bsitmProfilID.Type" xml:space="preserve">
|
||||||
|
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||||
|
</data>
|
||||||
<data name=">>RibbonPage1.Name" xml:space="preserve">
|
<data name=">>RibbonPage1.Name" xml:space="preserve">
|
||||||
<value>RibbonPage1</value>
|
<value>RibbonPage1</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ Public Class frmFormDesigner
|
|||||||
|
|
||||||
' Profil Name in Fenstertitel setzen
|
' Profil Name in Fenstertitel setzen
|
||||||
Text = $"Validation Designer - Profil: {ProfileName}"
|
Text = $"Validation Designer - Profil: {ProfileName}"
|
||||||
|
bsitmProfilID.Caption = $"ProfilID: {ProfileId}"
|
||||||
' Try
|
' Try
|
||||||
' Windream initialisieren
|
' Windream initialisieren
|
||||||
If IDB_ACTIVE = False Then
|
If IDB_ACTIVE = False Then
|
||||||
|
|||||||
@@ -2242,50 +2242,84 @@ Public Class frmMain
|
|||||||
Item_Scope("DOUBLECLICK")
|
Item_Scope("DOUBLECLICK")
|
||||||
End Sub
|
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
|
Private Sub GridViewWorkflows_CustomDrawGroupRow(sender As Object, e As Views.Base.RowObjectCustomDrawEventArgs) Handles GridViewWorkflows.CustomDrawGroupRow
|
||||||
Try
|
Try
|
||||||
' Added
|
|
||||||
If FormOpenClose = True And GridIsLoaded = False Then
|
If FormOpenClose = True And GridIsLoaded = False Then
|
||||||
Exit Sub
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Dim info As GridGroupRowInfo = TryCast(e.Info, GridGroupRowInfo)
|
Dim oInfo As GridGroupRowInfo = TryCast(e.Info, GridGroupRowInfo)
|
||||||
Dim view As GridView = sender
|
If oInfo Is Nothing OrElse oInfo.Column Is Nothing Then
|
||||||
|
Exit Sub
|
||||||
|
End If
|
||||||
|
|
||||||
If info.Column.FieldName = "GROUP_TEXT" Then
|
Dim oView As GridView = sender
|
||||||
info.GroupText = info.GroupValueText
|
|
||||||
|
If oInfo.Column.FieldName = "GROUP_TEXT" Then
|
||||||
|
oInfo.GroupText = oInfo.GroupValueText
|
||||||
|
|
||||||
Dim oColorString As String = "LightGray"
|
Dim oColorString As String = "LightGray"
|
||||||
Dim oFontColorString As String = "Black"
|
Dim oFontColorString As String = "Black"
|
||||||
Dim oFoundConfig As Boolean = False
|
Dim oChildRowHandle As Integer = oView.GetChildRowHandle(oInfo.RowHandle, 0)
|
||||||
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
|
|
||||||
|
|
||||||
|
oColorString = oView.GetRowCellValue(oChildRowHandle, "GROUP_COLOR")
|
||||||
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 oColor As Color = ParseColorString(oColorString, Color.LightGray, "Background Color")
|
||||||
Dim oFontColor As Color = ParseColorString(oFontColorString, Color.Black, "Font Color")
|
Dim oFontColor As Color = ParseColorString(oFontColorString, Color.Black, "Font Color")
|
||||||
|
|
||||||
info.Appearance.BackColor = oColor
|
oInfo.Appearance.BackColor = oColor
|
||||||
info.Appearance.ForeColor = oFontColor
|
oInfo.Appearance.ForeColor = oFontColor
|
||||||
End If
|
End If
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
LOGGER.Error(ex)
|
LOGGER.Error(ex)
|
||||||
@@ -3262,7 +3296,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
|
|||||||
|
|
||||||
LOGGER.Debug($"oTargetPath with NowParams: {oTargetPath}")
|
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
|
If oResult = True Then
|
||||||
WM_AHWF_docPath = oTargetPath
|
WM_AHWF_docPath = oTargetPath
|
||||||
Dim oDocID = WINDREAM_MOD.NewDocumentID
|
Dim oDocID = WINDREAM_MOD.NewDocumentID
|
||||||
|
|||||||
Reference in New Issue
Block a user