2 Commits

Author SHA1 Message Date
Jonathan Jenne
1b5e724750 EDMIService: Fix internal Placeholders 2022-03-15 16:34:54 +01:00
Jonathan Jenne
65ef8ccbc7 Zooflow: Badge shenanigans 2022-03-15 16:34:37 +01:00
6 changed files with 24 additions and 15 deletions

View File

@@ -133,6 +133,9 @@ Partial Class frmFlowForm
Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22)
Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden"
'
'TimerRefreshData
'
'
'PictureBoxPM
'
Me.PictureBoxPM.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -400,7 +403,7 @@ Partial Class frmFlowForm
Me.TaskBadge.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
Me.TaskBadge.Appearance.Options.UseBackColor = True
Me.TaskBadge.Properties.Location = System.Drawing.ContentAlignment.TopRight
Me.TaskBadge.Properties.Offset = New System.Drawing.Point(0, 0)
Me.TaskBadge.Properties.Offset = New System.Drawing.Point(-5, -5)
Me.TaskBadge.Properties.PaintStyle = DevExpress.Utils.VisualEffects.BadgePaintStyle.[Default]
Me.TaskBadge.Properties.Text = "0"
Me.TaskBadge.TargetElement = Me.PictureBoxPM

View File

@@ -2039,6 +2039,6 @@
</value>
</data>
<metadata name="AdornerUIManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 56</value>
<value>1115, 17</value>
</metadata>
</root>

View File

@@ -1292,5 +1292,9 @@ Public Class frmFlowForm
Private Sub PictureBoxPM_MouseLeave(sender As Object, e As EventArgs) Handles PictureBoxPM.MouseLeave
PictureBoxPM.SvgImage = My.Resources.FLOW_Sidebar_Task_inaktiv
End Sub
Private Sub TimerRefreshData_Tick_1(sender As Object, e As EventArgs) Handles TimerRefreshData.Tick
TaskBadge.Properties.Text = Date.Now.Millisecond.ToString.Last
End Sub
End Class

View File

@@ -9,7 +9,7 @@ Namespace Modules
"SELECT ", "UPDATE ", "DELETE ", "EXEC "
}
Private Const MAX_TRY_COUNT = 500
Private Const MAX_TRY_COUNT = 100
Public Sub New(pLogConfig As LogConfig)
Logger = pLogConfig.GetLogger()

View File

@@ -28,22 +28,24 @@ Namespace Modules.Globix
While ContainsPattern(oResult, PatternIdentifier)
Try
Dim oIndexName As String = GetNextPattern(oResult, PatternIdentifier).Value
Logger.Info("Replacing value for Index {0}", oIndexName)
If pIndexes.ContainsKey(oIndexName) = False Then
Logger.Warn("Value for Index [{0}] does not exist and will not be used for replacing. Skipping.", oIndexName)
Else
' TODO: If Index contains multiple values, only the first value will be used as value
Dim oIndexValues As List(Of String) = pIndexes.Item(oIndexName)
Dim oFirstValue As String = oIndexValues.FirstOrDefault()
If oFirstValue Is Nothing Then
Logger.Warn("Value for Index [{0}] is empty and will not be used for replacing. Skipping.")
Return oResult
End If
oResult = ReplacePattern(oResult, PatternIdentifier, oFirstValue)
End If
' TODO: If Index contains multiple values, only the first value will be used as value
Dim oIndexValues As List(Of String) = pIndexes.Item(oIndexName)
Dim oFirstValue As String = oIndexValues.FirstOrDefault()
If oFirstValue Is Nothing Then
Logger.Warn("Value for Index [{0}] is empty and will not be used for replacing. Skipping.")
Return oResult
End If
oResult = ReplacePattern(oResult, PatternIdentifier, oFirstValue)
Catch ex As Exception
Logger.Error(ex)
Return oResult

View File

@@ -38,7 +38,7 @@ Namespace Modules
' Replace CurrentDate(s)
While ContainsPatternAndValue(oResult, PatternIdentifier, INT_VALUE_DATE_YYYY_MM_DD)
Logger.Trace("Replacing Pattern [{0}]", INT_VALUE_DATE_YYYY_MM_DD)
oResult = ReplacePattern(oResult, PatternIdentifier, oNow.ToString("yyyy/MM/dd"))
oResult = ReplacePattern(oResult, PatternIdentifier, oNow.ToString("yyyy\\MM\\dd"))
IncrementCounterOrThrow(oCounter)
End While