Compare commits
12 Commits
a2e5d1c136
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
574c13c9ab | ||
|
|
966d3f404d | ||
|
|
0e2bef27a4 | ||
|
|
ffa97402ff | ||
|
|
8d6a5500a9 | ||
|
|
74863a6914 | ||
|
|
bca0002134 | ||
|
|
b5ae672091 | ||
|
|
107a47a97e | ||
|
|
cee6a11c99 | ||
|
|
de80d564b1 | ||
|
|
f571764588 |
@@ -114,9 +114,9 @@ Namespace ControlCreator
|
||||
|
||||
' *** DEBUG: Log VOR/NACH (nur beim ersten Aufruf) ***
|
||||
If LOG_HOTSPOTS Then
|
||||
_Logger.Info("[ResolveSqlTemplate] BEFORE: {0}",
|
||||
_Logger.Info("LOG_HOTSPOTS [ResolveSqlTemplate] BEFORE: {0}",
|
||||
beforeReplace.Substring(0, Math.Min(150, beforeReplace.Length)))
|
||||
_Logger.Info("[ResolveSqlTemplate] AFTER: {0}",
|
||||
_Logger.Info("LOG_HOTSPOTS [ResolveSqlTemplate] AFTER: {0}",
|
||||
resolvedSql.Substring(0, Math.Min(150, resolvedSql.Length)))
|
||||
End If
|
||||
Else
|
||||
@@ -843,14 +843,14 @@ Namespace ControlCreator
|
||||
' Cache prüfen
|
||||
SyncLock _DynamicEditorCacheShared
|
||||
If _DynamicEditorCacheShared.ContainsKey(cacheKey) Then
|
||||
_Logger.Info("[CustomRowCellEdit] ✓ CACHE HIT: [{0}]", cacheKey)
|
||||
_Logger.Debug("[CustomRowCellEdit] ✓ CACHE HIT: [{0}]", cacheKey)
|
||||
e.RepositoryItem = _DynamicEditorCacheShared(cacheKey)
|
||||
Return
|
||||
End If
|
||||
End SyncLock
|
||||
|
||||
' Editor erstellen mit RESOLVED SQL
|
||||
_Logger.Info("[CustomRowCellEdit] 🆕 MISS: Creating editor for [{0}]", e.Column.FieldName)
|
||||
_Logger.Debug("[CustomRowCellEdit] 🆕 MISS: Creating editor for [{0}]", e.Column.FieldName)
|
||||
Dim realEditor = CreateRowSpecificEditor(
|
||||
e.Column.FieldName,
|
||||
resolvedSql,
|
||||
@@ -865,7 +865,7 @@ Namespace ControlCreator
|
||||
_DynamicEditorCacheShared.Add(cacheKey, realEditor)
|
||||
End If
|
||||
End SyncLock
|
||||
_Logger.Info("[CustomRowCellEdit] ✓ Cached [{0}] editor (Type=[{1}])", e.Column.FieldName, realEditor.GetType().Name)
|
||||
_Logger.Debug("[CustomRowCellEdit] ✓ Cached [{0}] editor (Type=[{1}])", e.Column.FieldName, realEditor.GetType().Name)
|
||||
e.RepositoryItem = realEditor
|
||||
Else
|
||||
_Logger.Warn("[CustomRowCellEdit] CreateRowSpecificEditor returned Nothing for [{0}]", e.Column.FieldName)
|
||||
|
||||
@@ -33,6 +33,8 @@ Public Module ModuleControlProperties
|
||||
<Category(ClassConstants.CAT_GENERAL)>
|
||||
Public Property Name() As String
|
||||
|
||||
<Category(ClassConstants.CAT_BEHAVIOUR)>
|
||||
Public Property Active() As Boolean
|
||||
|
||||
<Category(ClassConstants.CAT_DISPLAY)>
|
||||
Public Property Location() As Point
|
||||
@@ -120,9 +122,6 @@ Public Module ModuleControlProperties
|
||||
Private _default_value
|
||||
Friend _set_control_data As String
|
||||
|
||||
<Category(ClassConstants.CAT_BEHAVIOUR)>
|
||||
Public Property Active() As Boolean
|
||||
|
||||
<Category(ClassConstants.CAT_VALIDATION)>
|
||||
Public Property Required() As Boolean
|
||||
|
||||
|
||||
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.9.4.0")>
|
||||
<Assembly: AssemblyVersion("2.9.7.0")>
|
||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||
<Assembly: NeutralResourcesLanguage("")>
|
||||
|
||||
@@ -186,7 +186,10 @@ Public Class frmFormDesigner
|
||||
End Function
|
||||
|
||||
Private Function IsNotBooleanIndex(IndexName As String) As Boolean
|
||||
Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
|
||||
Dim oType As Integer
|
||||
If IndexName = "@@DISPLAY_ONLY" Then
|
||||
Return 0
|
||||
End If
|
||||
If IDB_ACTIVE = False Then
|
||||
oType = WINDREAM_MOD.GetIndexType(IndexName)
|
||||
Else
|
||||
@@ -196,7 +199,10 @@ Public Class frmFormDesigner
|
||||
End Function
|
||||
|
||||
Private Function IsNotDateIndex(IndexName As String) As Boolean
|
||||
Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
|
||||
Dim oType As Integer
|
||||
If IndexName = "@@DISPLAY_ONLY" Then
|
||||
Return 0
|
||||
End If
|
||||
If IDB_ACTIVE = False Then
|
||||
oType = WINDREAM_MOD.GetIndexType(IndexName)
|
||||
Else
|
||||
@@ -206,7 +212,10 @@ Public Class frmFormDesigner
|
||||
End Function
|
||||
|
||||
Private Function IsNotVectorBooleanIndex(IndexName As String) As Boolean
|
||||
Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
|
||||
Dim oType As Integer
|
||||
If IndexName = "@@DISPLAY_ONLY" Then
|
||||
Return 0
|
||||
End If
|
||||
If IDB_ACTIVE = False Then
|
||||
oType = WINDREAM_MOD.GetIndexType(IndexName)
|
||||
Else
|
||||
@@ -216,7 +225,10 @@ Public Class frmFormDesigner
|
||||
End Function
|
||||
|
||||
Private Function IsNotVectorDateIndex(IndexName As String) As Boolean
|
||||
Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
|
||||
Dim oType As Integer
|
||||
If IndexName = "@@DISPLAY_ONLY" Then
|
||||
Return 0
|
||||
End If
|
||||
If IDB_ACTIVE = False Then
|
||||
oType = WINDREAM_MOD.GetIndexType(IndexName)
|
||||
Else
|
||||
@@ -226,7 +238,10 @@ Public Class frmFormDesigner
|
||||
End Function
|
||||
|
||||
Private Function IsNotVectorDatetimeIndex(IndexName As String) As Boolean
|
||||
Dim oType As Integer '= WINDREAM_MOD.GetIndexType(IndexName)
|
||||
Dim oType As Integer
|
||||
If IndexName = "@@DISPLAY_ONLY" Then
|
||||
Return 0
|
||||
End If
|
||||
If IDB_ACTIVE = False Then
|
||||
oType = WINDREAM_MOD.GetIndexType(IndexName)
|
||||
Else
|
||||
@@ -589,7 +604,7 @@ Public Class frmFormDesigner
|
||||
obj.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
|
||||
obj.ChangedAt = ClassAllgemeineFunktionen.NotNullDate(row.Item("CHANGED_WHEN"), Nothing)
|
||||
obj.ChangedWho = ClassAllgemeineFunktionen.NotNullString(row.Item("CHANGED_WHO"), "")
|
||||
|
||||
obj.Active = StrToBool(row.Item("CONTROL_ACTIVE"))
|
||||
Dim oStyle As FontStyle = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_STYLE"), FontStyle.Regular)
|
||||
Dim oSize As Single = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_SIZE"), 10)
|
||||
Dim oFamilyString As String = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_FAMILY"), "Arial")
|
||||
@@ -906,7 +921,8 @@ Public Class frmFormDesigner
|
||||
UpdateSingleValue("REGEX_MESSAGE_DE", newValue)
|
||||
|
||||
Case "Active"
|
||||
UpdateSingleValue("CONTROL_ACTIVE", IIf(newValue = True, 1, 0))
|
||||
Dim oActive As Boolean = IIf(newValue = True, 1, 0)
|
||||
UpdateSingleValue("CONTROL_ACTIVE", oActive)
|
||||
|
||||
Case "DISPLAY_SEP_FORM"
|
||||
UpdateSingleValue("DISPLAY_IN_SEPERATE_FORM", IIf(newValue = True, 1, 0))
|
||||
@@ -977,7 +993,8 @@ Public Class frmFormDesigner
|
||||
End If
|
||||
|
||||
Try
|
||||
If DatabaseFallback.ExecuteNonQueryECM($"UPDATE TBPM_PROFILE_CONTROLS SET {columnName} = {escapedValue}, CHANGED_WHO = '{USER_USERNAME}' WHERE GUID = {guid}") = True Then
|
||||
Dim oUPD = $"UPDATE TBPM_PROFILE_CONTROLS SET {columnName} = {escapedValue}, CHANGED_WHO = '{USER_USERNAME}' WHERE GUID = {guid}"
|
||||
If DatabaseFallback.ExecuteNonQueryECM(oUPD) = True Then
|
||||
tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
|
||||
tslblAenderungen.Caption = "Änderungen gespeichert - " & Now
|
||||
If columnName.ToUpper = "CTRL_TEXT" Then
|
||||
@@ -986,6 +1003,8 @@ Public Class frmFormDesigner
|
||||
End If
|
||||
CHANGES_FORM_DESIGN = True
|
||||
Return True
|
||||
Else
|
||||
_Logger.Info($"UpdateSingleValue - Fehler beim Speichern von Control (Id: {guid}): ExecuteNonQueryECM [{oUPD}] returned False")
|
||||
End If
|
||||
|
||||
Return False
|
||||
@@ -1155,16 +1174,22 @@ Public Class frmFormDesigner
|
||||
Dim label = ControlCreator.CreateNewLabel(cursorPosition)
|
||||
SetMovementHandlers(label)
|
||||
|
||||
TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, label.Name, "LBL", label.Text, label.Location.X, label.Location.Y, USER_USERNAME, label.Size.Height, label.Size.Width, label.TextAlign, "")
|
||||
CHANGES_FORM_DESIGN = True
|
||||
CurrentControl = label
|
||||
CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
|
||||
.Guid = GetLastID(),
|
||||
.ReadOnly = False
|
||||
}
|
||||
|
||||
pnldesigner.Controls.Add(label)
|
||||
|
||||
Dim oInsert = $"INSERT INTO TBPM_PROFILE_CONTROLS
|
||||
(PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, HEIGHT, WIDTH, TEXT_ALIGNMENT, DISPLAY_IN_SEPERATE_FORM)
|
||||
VALUES ({ProfileId},'{label.Name}','LBL','{label.Text}','{label.Location.X}','{label.Location.Y}','{USER_USERNAME}',{label.Size.Height},{label.Size.Width},'{label.TextAlign}','')"
|
||||
If DatabaseFallback.ExecuteNonQueryECM(oInsert) Then
|
||||
'TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, label.Name, "LBL", label.Text, label.Location.X, label.Location.Y, USER_USERNAME, label.Size.Height, label.Size.Width, label.TextAlign, "")
|
||||
CHANGES_FORM_DESIGN = True
|
||||
CurrentControl = label
|
||||
CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {
|
||||
.Guid = GetLastID(),
|
||||
.ReadOnly = False
|
||||
}
|
||||
pnldesigner.Controls.Add(label)
|
||||
Else
|
||||
_Logger.Info($"Error while inserting new Label Control into TBPM_PROFILE_CONTROLS: {oInsert}")
|
||||
MsgBox("Fehler beim Erstellen des Labels. Bitte überprüfen Sie die Log-Datei für weitere Informationen.", MsgBoxStyle.Critical, "Fehler beim Erstellen des Labels")
|
||||
End If
|
||||
Case ClassControlCreator.PREFIX_TEXTBOX
|
||||
Dim txt = ControlCreator.CreateNewTextBox(cursorPosition)
|
||||
SetMovementHandlers(txt)
|
||||
@@ -1296,9 +1321,9 @@ Public Class frmFormDesigner
|
||||
RibPGCtrlWidth.Enabled = True
|
||||
End If
|
||||
Catch ex As Exception
|
||||
_Logger.Error(ex)
|
||||
_Logger.Info($"Error while Adding new control {NewControlSelected}:")
|
||||
_Logger.Info(ex)
|
||||
MsgBox($"Error while Adding new control {NewControlSelected}: {ex.Message}" & vbCrLf & "Check the log for further info", MsgBoxStyle.Critical)
|
||||
End Try
|
||||
Me.Cursor = Cursors.Default
|
||||
NewControlSelected = ""
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAAQgBDAEIAQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
CAAAAk1TRnQBSQFMAgEBAgEAARABDAEQAQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||
@@ -1496,9 +1496,36 @@
|
||||
<data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup1.Text" xml:space="preserve">
|
||||
<value>Allgemein</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup2.Text" xml:space="preserve">
|
||||
<value>Auswertungen</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup3.Text" xml:space="preserve">
|
||||
<value>Verwaltung</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroupBasicConf.Text" xml:space="preserve">
|
||||
<value>Grundeinstellungen</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup7.Text" xml:space="preserve">
|
||||
<value>Workflow</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup4.Text" xml:space="preserve">
|
||||
<value>Funktionen/App Start</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroupAHW.Text" xml:space="preserve">
|
||||
<value>Ad Hoc Workflows</value>
|
||||
</data>
|
||||
<data name="RibbonPageStart.Text" xml:space="preserve">
|
||||
<value>Start</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup6.Text" xml:space="preserve">
|
||||
<value>Funktionen</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup5.Text" xml:space="preserve">
|
||||
<value>Workflow Tabelle</value>
|
||||
</data>
|
||||
<data name="RibbonPageTabelle.Text" xml:space="preserve">
|
||||
<value>Tabelle</value>
|
||||
</data>
|
||||
@@ -1556,6 +1583,24 @@
|
||||
<data name=">>GridControlWorkflows.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="lblCaptionMainGrid.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblCaptionMainGrid.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<value>Tahoma, 9.75pt, style=Bold</value>
|
||||
</data>
|
||||
<data name="lblCaptionMainGrid.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>3, 3</value>
|
||||
</data>
|
||||
<data name="lblCaptionMainGrid.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>127, 16</value>
|
||||
</data>
|
||||
<data name="lblCaptionMainGrid.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="lblCaptionMainGrid.Text" xml:space="preserve">
|
||||
<value>Choose a profile ...</value>
|
||||
</data>
|
||||
<data name=">>lblCaptionMainGrid.Name" xml:space="preserve">
|
||||
<value>lblCaptionMainGrid</value>
|
||||
</data>
|
||||
@@ -1647,6 +1692,12 @@
|
||||
<metadata name="cmsNavPane.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>863, 17</value>
|
||||
</metadata>
|
||||
<data name="tsmiValidationProfil.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>219, 26</value>
|
||||
</data>
|
||||
<data name="tsmiValidationProfil.Text" xml:space="preserve">
|
||||
<value>Starte Validierung für Profil</value>
|
||||
</data>
|
||||
<data name="cmsNavPane.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>220, 30</value>
|
||||
</data>
|
||||
@@ -1829,69 +1880,6 @@
|
||||
<data name=">>Panel1.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup1.Text" xml:space="preserve">
|
||||
<value>Allgemein</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup2.Text" xml:space="preserve">
|
||||
<value>Auswertungen</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup3.Text" xml:space="preserve">
|
||||
<value>Verwaltung</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroupBasicConf.Text" xml:space="preserve">
|
||||
<value>Grundeinstellungen</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup7.Text" xml:space="preserve">
|
||||
<value>Workflow</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup4.Text" xml:space="preserve">
|
||||
<value>Funktionen/App Start</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroupAHW.Text" xml:space="preserve">
|
||||
<value>Ad Hoc Workflows</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup6.Text" xml:space="preserve">
|
||||
<value>Funktionen</value>
|
||||
</data>
|
||||
<data name="RibbonPageGroup5.Text" xml:space="preserve">
|
||||
<value>Workflow Tabelle</value>
|
||||
</data>
|
||||
<data name="lblCaptionMainGrid.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblCaptionMainGrid.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<value>Tahoma, 9.75pt, style=Bold</value>
|
||||
</data>
|
||||
<data name="lblCaptionMainGrid.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>3, 3</value>
|
||||
</data>
|
||||
<data name="lblCaptionMainGrid.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>127, 16</value>
|
||||
</data>
|
||||
<data name="lblCaptionMainGrid.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="lblCaptionMainGrid.Text" xml:space="preserve">
|
||||
<value>Choose a profile ...</value>
|
||||
</data>
|
||||
<data name=">>lblCaptionMainGrid.Name" xml:space="preserve">
|
||||
<value>lblCaptionMainGrid</value>
|
||||
</data>
|
||||
<data name=">>lblCaptionMainGrid.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>lblCaptionMainGrid.Parent" xml:space="preserve">
|
||||
<value>Panel2</value>
|
||||
</data>
|
||||
<data name=">>lblCaptionMainGrid.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="tsmiValidationProfil.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>219, 26</value>
|
||||
</data>
|
||||
<data name="tsmiValidationProfil.Text" xml:space="preserve">
|
||||
<value>Starte Validierung für Profil</value>
|
||||
</data>
|
||||
<metadata name="bindsourcegrid.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>986, 17</value>
|
||||
</metadata>
|
||||
@@ -1901,6 +1889,27 @@
|
||||
<metadata name="ContextMenuNotifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1220, 17</value>
|
||||
</metadata>
|
||||
<data name="PopupErinnerungInaktivierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>290, 30</value>
|
||||
</data>
|
||||
<data name="PopupErinnerungInaktivierenToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>Popup Erinnerung deaktivieren</value>
|
||||
</data>
|
||||
<data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>287, 6</value>
|
||||
</data>
|
||||
<data name="AnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>290, 30</value>
|
||||
</data>
|
||||
<data name="AnzeigenToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>In den Vordergrund</value>
|
||||
</data>
|
||||
<data name="OutOfRangePMFixierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>290, 30</value>
|
||||
</data>
|
||||
<data name="OutOfRangePMFixierenToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>Out of Range - Fenster wiederherstellen</value>
|
||||
</data>
|
||||
<data name="ContextMenuNotifyIcon.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>291, 100</value>
|
||||
</data>
|
||||
@@ -1996,27 +2005,6 @@
|
||||
<data name="NotifyIcon1.Visible" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="PopupErinnerungInaktivierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>290, 30</value>
|
||||
</data>
|
||||
<data name="PopupErinnerungInaktivierenToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>Popup Erinnerung deaktivieren</value>
|
||||
</data>
|
||||
<data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>287, 6</value>
|
||||
</data>
|
||||
<data name="AnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>290, 30</value>
|
||||
</data>
|
||||
<data name="AnzeigenToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>In den Vordergrund</value>
|
||||
</data>
|
||||
<data name="OutOfRangePMFixierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>290, 30</value>
|
||||
</data>
|
||||
<data name="OutOfRangePMFixierenToolStripMenuItem.Text" xml:space="preserve">
|
||||
<value>Out of Range - Fenster wiederherstellen</value>
|
||||
</data>
|
||||
<metadata name="TimerRefresh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>605, 17</value>
|
||||
</metadata>
|
||||
@@ -3444,9 +3432,6 @@
|
||||
<data name="miView.Caption" xml:space="preserve">
|
||||
<value>&Ansicht</value>
|
||||
</data>
|
||||
<data name="miBackground.Caption" xml:space="preserve">
|
||||
<value>&Hintergrund</value>
|
||||
</data>
|
||||
<data name="miPageLayout.Caption" xml:space="preserve">
|
||||
<value>&Seiten Layout</value>
|
||||
</data>
|
||||
@@ -3459,6 +3444,9 @@
|
||||
<data name="miToolbars.Caption" xml:space="preserve">
|
||||
<value>Bars</value>
|
||||
</data>
|
||||
<data name="miBackground.Caption" xml:space="preserve">
|
||||
<value>&Hintergrund</value>
|
||||
</data>
|
||||
<data name="PrintPreviewBarCheckItem1.Caption" xml:space="preserve">
|
||||
<value>PDF Dokument</value>
|
||||
</data>
|
||||
|
||||
@@ -2134,6 +2134,12 @@ Public Class frmMain
|
||||
End If
|
||||
End Try
|
||||
End Sub
|
||||
Private Sub Reset_Current()
|
||||
CURRENT_JUMP_DOC_GUID = 0
|
||||
CURRENT_DOC_GUID = 0
|
||||
CURRENT_DOC_ID = 0
|
||||
End Sub
|
||||
|
||||
Private Async Function Item_Scope(startedFrom As String) As Task
|
||||
' ========== FRÜHE VALIDIERUNGEN (VOR UI-ÄNDERUNGEN) ==========
|
||||
If Application.OpenForms().OfType(Of frmValidator).Any Then
|
||||
@@ -2392,6 +2398,7 @@ Public Class frmMain
|
||||
' GRUPPE: Workflow ohne spezifisches Dokument
|
||||
CURRENT_JUMP_DOC_GUID = 0
|
||||
CURRENT_DOC_GUID = 0
|
||||
CURRENT_DOC_ID = 0
|
||||
CURRENT_ProfilGUID = CURRENT_CLICKED_PROFILE_ID
|
||||
LOGGER.Debug($"Item_Scope: hitInfo.InGroupRow...CURRENT_CLICKED_PROFILE_ID [{CURRENT_CLICKED_PROFILE_ID}]")
|
||||
Load_Profil_from_Grid(CURRENT_CLICKED_PROFILE_ID)
|
||||
@@ -3204,7 +3211,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
|
||||
})
|
||||
EnsureProfileSearchType(BASEDATA_DT_PROFILES_SEARCHES_DATA, "SQL", NameOf(BASEDATA_DT_PROFILES_SEARCHES_DATA))
|
||||
|
||||
oSQL = String.Format("SELECT [dbo].[FNPM_LANGUAGE_CONTROL_TEXT] (NAME,'{0}',CTRL_TYPE,CTRL_TEXT) CTRL_CAPTION_LANG, '{0}' as LANGUAGE, * FROM TBPM_PROFILE_CONTROLS WITH (NOLOCK)", {USER_LANGUAGE})
|
||||
oSQL = String.Format("SELECT [dbo].[FNPM_LANGUAGE_CONTROL_TEXT] (NAME,'{0}',CTRL_TYPE,CTRL_TEXT) CTRL_CAPTION_LANG, '{0}' as LANGUAGE, * FROM TBPM_PROFILE_CONTROLS WITH (NOLOCK) WHERE CONTROL_ACTIVE = 1", {USER_LANGUAGE})
|
||||
BASEDATA_TBPM_PROFILE_CONTROLS = DatabaseFallback.GetDatatable("TBPM_PROFILE_CONTROLS_LANGUAGE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
|
||||
.FilterExpression = String.Format("LANGUAGE = '{0}'", {USER_LANGUAGE})
|
||||
})
|
||||
|
||||
@@ -1164,7 +1164,6 @@ Public Class frmMassValidator
|
||||
If CreateWMObject() = True Then
|
||||
If ClassFinalizeDoc.Write_Final_Metadata(CURRENT_WMFILE) = True Then
|
||||
Dim sql = $"EXEC PRTF_PROFILE_FILES_WORK {CURRENT_DOC_ID},{CURRENT_ProfilGUID},{USER_ID},'Worked'"
|
||||
|
||||
'String.Format("UPDATE TBPM_PROFILE_FILES SET IN_WORK = 0, WORK_USER = '{0}', EDIT = 1 WHERE GUID = {1}", USER_USERNAME, CURRENT_DOC_GUID)
|
||||
If DatabaseFallback.ExecuteNonQueryECM(sql) = True Then
|
||||
workedFiles += 1
|
||||
|
||||
@@ -722,6 +722,8 @@ Public Class frmValidator
|
||||
End If
|
||||
_isClosingGuard = True
|
||||
_FormClosing = True
|
||||
' KRITISCH: Dokument freigeben bevor Form schließt
|
||||
PRTF_PROFILE_FILES_WORK("FreeFile")
|
||||
|
||||
' ===== FIX: Grid-Events SOFORT deregistrieren =====
|
||||
' Der GridControl-Lambda läuft noch asynchron weiter und greift sonst
|
||||
@@ -811,13 +813,9 @@ Public Class frmValidator
|
||||
|
||||
Try
|
||||
Dim oSQL As String
|
||||
If CURRENT_DOC_GUID <> 0 Then
|
||||
Dim oPRoc = String.Format("EXEC PRTF_PROFILE_FILES_WORK {0},{1},{2},'FreeFile';", CURRENT_DOC_ID, CURRENT_ProfilGUID, USER_ID)
|
||||
oSQL = $"DELETE FROM TBPM_DOCWALKOVER WHERE UserID = {USER_ID};" & vbCrLf & oPRoc
|
||||
Else
|
||||
oSQL = $"DELETE FROM TBPM_DOCWALKOVER WHERE UserID = {USER_ID};"
|
||||
End If
|
||||
|
||||
oSQL = $"DELETE FROM TBPM_DOCWALKOVER WHERE UserID = {USER_ID};" & vbCrLf &
|
||||
$"DELETE FROM TBPM_VALIDATION_PROFILE_GROUP_USER WHERE UserID = {USER_ID};" & vbCrLf &
|
||||
$"DELETE FROM TBTF_PROFILE_FILES_WORK WHERE Action_UserID = {USER_ID};"
|
||||
DatabaseFallback.ExecuteNonQueryECM(oSQL)
|
||||
Catch ex As Exception
|
||||
MyValidationLogger.Error(ex)
|
||||
@@ -1384,9 +1382,8 @@ Public Class frmValidator
|
||||
Next
|
||||
End If
|
||||
' ========== ENDE ==========
|
||||
|
||||
oSQL = $"SELECT IIF(LANG.CAPTION IS NULL,T.SPALTEN_HEADER,LANG.CAPTION) SPALTEN_HEADER_LANG, T.* from TBPM_CONTROL_TABLE T WITH (NOLOCK) INNER JOIN TBPM_PROFILE_CONTROLS T1 WITH (NOLOCK) ON T.CONTROL_ID = T1.GUID
|
||||
LEFT JOIN (SELECT * FROM TBPM_CONTOL_TABLE_LANG WHERE LANG_CODE = '{USER_LANGUAGE}') LANG ON T.GUID = LANG.COL_ID WHERE T1.CONTROL_ACTIVE = 1 AND T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY T.SEQUENCE"
|
||||
LEFT JOIN (SELECT * FROM TBPM_CONTOL_TABLE_LANG WHERE LANG_CODE = '{USER_LANGUAGE}') LANG ON T.GUID = LANG.COL_ID WHERE T1.CONTROL_ACTIVE = 1 AND T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY T.SEQUENCE"
|
||||
DT_COLUMNS_GRID = DatabaseFallback.GetDatatable("TBPM_CONTROL_TABLE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
|
||||
.FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID} AND LANG_CODE = '{USER_LANGUAGE}' ",
|
||||
.SortByColumn = "SEQUENCE"
|
||||
@@ -1796,6 +1793,7 @@ Public Class frmValidator
|
||||
Case Type = GetType(Windows.Forms.ComboBox)
|
||||
Dim cmb As Windows.Forms.ComboBox = inctrl
|
||||
cmb.SelectedIndex = -1
|
||||
cmb.Text = String.Empty
|
||||
Case Type = GetType(DataGridView)
|
||||
Dim dgv As DataGridView = inctrl
|
||||
If dgv.Rows.Count > 0 Then
|
||||
@@ -3784,9 +3782,9 @@ Public Class frmValidator
|
||||
' Fallback zu SQL
|
||||
Dim query As String
|
||||
If String.IsNullOrWhiteSpace(filter) Then
|
||||
query = "SELECT * FROM TBPM_PROFILE_CONTROLS"
|
||||
query = "SELECT * FROM TBPM_PROFILE_CONTROLS WHERE CONTROL_ACTIVE = 1"
|
||||
Else
|
||||
query = $"SELECT * FROM TBPM_PROFILE_CONTROLS WHERE {filter}"
|
||||
query = $"SELECT * FROM TBPM_PROFILE_CONTROLS WHERE CONTROL_ACTIVE = 1 AND {filter}"
|
||||
End If
|
||||
|
||||
If Not String.IsNullOrWhiteSpace(SortBy) Then
|
||||
@@ -4150,7 +4148,7 @@ Public Class frmValidator
|
||||
If LOG_HOTSPOTS Then
|
||||
perfStart = DateTime.Now
|
||||
perfLastCheck = perfStart
|
||||
MyValidationLogger.Info("[PERF LND] Load_Next_Document START")
|
||||
MyValidationLogger.Info("[LOG_HOTSPOTS] Load_Next_Document START")
|
||||
End If
|
||||
|
||||
_CachedSqlDataCache.Clear()
|
||||
@@ -4198,7 +4196,7 @@ Public Class frmValidator
|
||||
End If
|
||||
|
||||
If LOG_HOTSPOTS Then
|
||||
MyValidationLogger.Info($"[PERF LND] Nach Get_Next_GUID: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
MyValidationLogger.Info($"[LOG_HOTSPOTS] Nach Get_Next_GUID: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
perfLastCheck = DateTime.Now
|
||||
End If
|
||||
|
||||
@@ -4209,7 +4207,7 @@ Public Class frmValidator
|
||||
End If
|
||||
|
||||
If LOG_HOTSPOTS Then
|
||||
MyValidationLogger.Info($"[PERF LND] Nach GetDocPathWindows: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
MyValidationLogger.Info($"[LOG_HOTSPOTS] Nach GetDocPathWindows: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
perfLastCheck = DateTime.Now
|
||||
End If
|
||||
|
||||
@@ -4221,7 +4219,7 @@ Public Class frmValidator
|
||||
Load_IDB_DOC_DATA()
|
||||
|
||||
If LOG_HOTSPOTS Then
|
||||
MyValidationLogger.Info($"[PERF LND] Nach Load_IDB_DOC_DATA: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
MyValidationLogger.Info($"[LOG_HOTSPOTS] Nach Load_IDB_DOC_DATA: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
perfLastCheck = DateTime.Now
|
||||
End If
|
||||
If IsNothing(IDB_DT_DOC_DATA) Then
|
||||
@@ -4235,17 +4233,17 @@ Public Class frmValidator
|
||||
End If
|
||||
|
||||
If LOG_HOTSPOTS Then
|
||||
MyValidationLogger.Info($"[PERF LND] Nach CreateWMObject/Load_IDB_DOC_DATA: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
MyValidationLogger.Info($"[LOG_HOTSPOTS] Nach CreateWMObject/Load_IDB_DOC_DATA: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
perfLastCheck = DateTime.Now
|
||||
End If
|
||||
PRTF_PROFILE_FILES_WORK("InWork")
|
||||
If LOG_HOTSPOTS Then
|
||||
MyValidationLogger.Info($"[PERF LND] Nach IN_WORK-UPDATE: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
MyValidationLogger.Info($"[LOG_HOTSPOTS] Nach IN_WORK-UPDATE: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
perfLastCheck = DateTime.Now
|
||||
End If
|
||||
|
||||
If Amount_Docs2Validate > 1 Then
|
||||
Dim omsg = String.Format(Translation_Strings.Verbleibende_Vorgänge___0_, Amount_Docs2Validate)
|
||||
Dim omsg = String.Format(Translation_Strings.Verbleibende_Vorgänge___0_, Amount_Docs2Validate - 1)
|
||||
bsiInformation.Caption = omsg
|
||||
bsiInformation.Caption = omsg
|
||||
If RbnPgGrpActions.Visible = False Then
|
||||
@@ -4268,7 +4266,7 @@ Public Class frmValidator
|
||||
End If
|
||||
|
||||
If LOG_HOTSPOTS Then
|
||||
MyValidationLogger.Info($"[PERF LND] Nach Windream_get_Doc_info: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
MyValidationLogger.Info($"[LOG_HOTSPOTS] Nach Windream_get_Doc_info: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
perfLastCheck = DateTime.Now
|
||||
End If
|
||||
|
||||
@@ -4285,9 +4283,9 @@ Public Class frmValidator
|
||||
If LOG_HOTSPOTS Then
|
||||
oMilliseconts = (DateTime.Now - perfLastCheck).TotalMilliseconds
|
||||
If oMilliseconts > 6000 Then
|
||||
MyValidationLogger.Warn($"[PERF LND] ⚠️ LoadDocument_DDViewer lasted far to long: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
MyValidationLogger.Warn($"[LOG_HOTSPOTS] ⚠️ LoadDocument_DDViewer lasted far to long: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
Else
|
||||
MyValidationLogger.Info($"[PERF LND] Nach LoadDocument_DDViewer: {oMilliseconts}ms")
|
||||
MyValidationLogger.Info($"[LOG_HOTSPOTS] Nach LoadDocument_DDViewer: {oMilliseconts}ms")
|
||||
End If
|
||||
perfLastCheck = DateTime.Now
|
||||
End If
|
||||
@@ -4336,9 +4334,9 @@ Public Class frmValidator
|
||||
If LOG_HOTSPOTS Then
|
||||
oMilliseconts = (DateTime.Now - perfLastCheck).TotalMilliseconds
|
||||
If oMilliseconts > 6000 Then
|
||||
MyValidationLogger.Warn($"[PERF LND] ⚠️ FillIndexValues lasted far to long: {oMilliseconts}ms")
|
||||
MyValidationLogger.Warn($"[LOG_HOTSPOTS] ⚠️ FillIndexValues lasted far to long: {oMilliseconts}ms")
|
||||
Else
|
||||
MyValidationLogger.Info($"[PERF LND] Nach FillIndexValues: {oMilliseconts}ms")
|
||||
MyValidationLogger.Info($"[LOG_HOTSPOTS] Nach FillIndexValues: {oMilliseconts}ms")
|
||||
End If
|
||||
|
||||
perfLastCheck = DateTime.Now
|
||||
@@ -4370,7 +4368,7 @@ Public Class frmValidator
|
||||
End If
|
||||
|
||||
If LOG_HOTSPOTS Then
|
||||
MyValidationLogger.Info($"[PERF LND] Nach LoadSQLData-Loop: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
MyValidationLogger.Info($"[LOG_HOTSPOTS] Nach LoadSQLData-Loop: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
perfLastCheck = DateTime.Now
|
||||
End If
|
||||
|
||||
@@ -4452,7 +4450,7 @@ Public Class frmValidator
|
||||
End Try
|
||||
|
||||
If LOG_HOTSPOTS Then
|
||||
MyValidationLogger.Info($"[PERF LND] Nach Currency-Format: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
MyValidationLogger.Info($"[LOG_HOTSPOTS] Nach Currency-Format: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
perfLastCheck = DateTime.Now
|
||||
End If
|
||||
|
||||
@@ -4464,9 +4462,9 @@ Public Class frmValidator
|
||||
If LOG_HOTSPOTS Then
|
||||
oMilliseconts = (DateTime.Now - perfLastCheck).TotalMilliseconds
|
||||
If oMilliseconts > 6000 Then
|
||||
MyValidationLogger.Warn($"[PERF LND] ⚠️ Show_WF_Messages lasted far to long: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
MyValidationLogger.Warn($"[LOG_HOTSPOTS] ⚠️ Show_WF_Messages lasted far to long: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
Else
|
||||
MyValidationLogger.Info($"[PERF LND] Nach Show_WF_Messages: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
MyValidationLogger.Info($"[LOG_HOTSPOTS] Nach Show_WF_Messages: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
End If
|
||||
|
||||
perfLastCheck = DateTime.Now
|
||||
@@ -4480,7 +4478,7 @@ Public Class frmValidator
|
||||
Controls2B_EnDisabled_onLoad()
|
||||
|
||||
If LOG_HOTSPOTS Then
|
||||
MyValidationLogger.Info($"[PERF LND] Nach Controls2B_EnDisabled: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
MyValidationLogger.Info($"[LOG_HOTSPOTS] Nach Controls2B_EnDisabled: {(DateTime.Now - perfLastCheck).TotalMilliseconds}ms")
|
||||
perfLastCheck = DateTime.Now
|
||||
End If
|
||||
MyValidationLogger.Debug("frmValidator: LoadNextDocument finished!")
|
||||
@@ -4489,7 +4487,7 @@ Public Class frmValidator
|
||||
MyValidationLogger.Error(ex)
|
||||
errormessage = "unexpected error in Load_Next_Document:" & ex.Message
|
||||
My.Settings.Save()
|
||||
|
||||
PRTF_PROFILE_FILES_WORK("FreeFile")
|
||||
MyValidationLogger.Info("unexpected error in Load_Next_Document: " & ex.Message)
|
||||
|
||||
frmError.ShowDialog()
|
||||
@@ -4500,11 +4498,11 @@ Public Class frmValidator
|
||||
CloseOverlaySafe()
|
||||
If LOG_HOTSPOTS Then
|
||||
' ========== DIAGNOSE ENDE ==========
|
||||
MyValidationLogger.Info($"[INFO] Load_Next_Document ENDE")
|
||||
MyValidationLogger.Info($" frmValidator.IsDisposed: {Me.IsDisposed}")
|
||||
MyValidationLogger.Info($" frmValidator.Visible: {Me.Visible}")
|
||||
MyValidationLogger.Info($"[LHS] Load_Next_Document ENDE")
|
||||
MyValidationLogger.Info($"[LHS] frmValidator.IsDisposed: {Me.IsDisposed}")
|
||||
MyValidationLogger.Info($"[LHS] frmValidator.Visible: {Me.Visible}")
|
||||
' ========== ENDE DIAGNOSE ==========
|
||||
MyValidationLogger.Info($"[PERF LND] Load_Next_Document GESAMT: {(DateTime.Now - perfStart).TotalMilliseconds}ms")
|
||||
MyValidationLogger.Info($"[LHS] Load_Next_Document GESAMT: {(DateTime.Now - perfStart).TotalMilliseconds}ms")
|
||||
End If
|
||||
End Try
|
||||
End Sub
|
||||
@@ -5308,8 +5306,8 @@ Public Class frmValidator
|
||||
oValueFromSource = GetVariableValuefromSource(oSourceIndexName, oIDBTyp, oIDBOverride)
|
||||
End If
|
||||
|
||||
If oValueFromSource Is Nothing Then
|
||||
MyValidationLogger.Debug($"oMyComboBox {oMyCombobox.Name} - Indexvalue from index {oSourceIndexName}: Nothing")
|
||||
If oValueFromSource Is Nothing Or IsDBNull(oValueFromSource) Then
|
||||
MyValidationLogger.Debug($"oMyComboBox {oMyCombobox.Name} - Indexvalue from index {oSourceIndexName} is Nothing or DBNull")
|
||||
If oDefaultValue = String.Empty Then
|
||||
MyValidationLogger.Debug($"oMyComboBox {oMyCombobox.Name}-defaultValue wurde nicht gefunden")
|
||||
oMyCombobox.SelectedIndex = -1
|
||||
@@ -5810,19 +5808,19 @@ Public Class frmValidator
|
||||
oNewValues = New List(Of String) From {oValueFromSource.ToString}
|
||||
End If
|
||||
Else
|
||||
' ========== BUGFIX START: Wenn KEIN neuer Wert, alte Werte behalten ==========
|
||||
If hadPreviousSelection AndAlso previousSelectedValues IsNot Nothing AndAlso previousSelectedValues.Count > 0 Then
|
||||
MyValidationLogger.Debug($"[FillIndexValues BUGFIX] Lookup [{oLookupMeta.Name}]: Kein neuer Wert von Quelle → alte Werte BEHALTEN")
|
||||
oNewValues = previousSelectedValues
|
||||
ElseIf oDefaultValue <> String.Empty Then
|
||||
MyValidationLogger.Debug($"[FillIndexValues BUGFIX] Lookup [{oLookupMeta.Name}]: Keine alten Werte, verwende DefaultValue = [{oDefaultValue}]")
|
||||
' ========== BUGFIX START: Wenn KEIN neuer Wert, SelectedValues LÖSCHEN ==========
|
||||
If oDefaultValue <> String.Empty Then
|
||||
MyValidationLogger.Debug($"[FillIndexValues] Lookup [{oLookupMeta.Name}]: Verwende DefaultValue = [{oDefaultValue}]")
|
||||
oNewValues = oDefaultValue.Split(",").ToList()
|
||||
Else
|
||||
MyValidationLogger.Debug($"[FillIndexValues BUGFIX] Lookup [{oLookupMeta.Name}]: KEINE Werte (oValueFromSource=Nothing, oDefaultValue leer, keine vorherigen Werte)")
|
||||
' WICHTIG: Keine alten Werte mehr übernehmen! → oNewValues bleibt Nothing
|
||||
MyValidationLogger.Debug($"[FillIndexValues] Lookup [{oLookupMeta.Name}]: Kein Index-Wert vorhanden → SelectedValues werden gelöscht")
|
||||
oNewValues = Nothing
|
||||
End If
|
||||
' ========== BUGFIX END: Wert-Beibehaltung ==========
|
||||
' ========== BUGFIX END: Alte Werte werden NICHT mehr beibehalten ==========
|
||||
End If
|
||||
|
||||
|
||||
' ========== KRITISCH: DataSource-Backup erstellen BEVOR SelectedValues gelöscht wird ==========
|
||||
Dim savedDataSource = oLookup.Properties.DataSource
|
||||
MyValidationLogger.Debug($"[FillIndexValues BUGFIX] Lookup [{oLookupMeta.Name}]: DataSource-Backup erstellt")
|
||||
@@ -6998,7 +6996,7 @@ Public Class frmValidator
|
||||
Next
|
||||
Return odt
|
||||
End Function
|
||||
Function Check_UpdateIndexe() As Boolean
|
||||
Function Check_UpdateIndexe(Optional ByVal pRegularComplete As Boolean = True) As Boolean
|
||||
Dim oControlName
|
||||
Dim oControlId As String
|
||||
Try
|
||||
@@ -7089,12 +7087,17 @@ Public Class frmValidator
|
||||
Try
|
||||
Dim lookup As LookupControl3 = oControl
|
||||
If lookup.Properties.SelectedValues.Count = 0 And oIsRequired = True Then
|
||||
oMissing = True
|
||||
oErrMsgMissingInput = $"Kein Auswahl getroffen in LookupGrid '{oControl.Name}'"
|
||||
MyValidationLogger.Warn($"⚠️ Kein Auswahl getroffen in LookupGrid '{oControl.Name}'")
|
||||
oControl.BackColor = Color.Red
|
||||
frmError.ShowDialog()
|
||||
Exit For
|
||||
If pRegularComplete = False Then
|
||||
MyValidationLogger.Debug($"[CHECK_UPDATE] LookupGrid '{oControl.Name}' is required but has no selection. Skipping due to pRegularComplete=False.")
|
||||
Continue For
|
||||
Else
|
||||
oMissing = True
|
||||
oErrMsgMissingInput = $"Pflichtfeld: Keine Auswahl getroffen in LookupGrid '{oControl.Name}'"
|
||||
MyValidationLogger.Warn($"⚠️ {oErrMsgMissingInput}")
|
||||
oControl.BackColor = Color.Red
|
||||
OpenfrmError(oErrMsgMissingInput)
|
||||
Exit For
|
||||
End If
|
||||
Else
|
||||
If lookup.Properties.MultiSelect = True Then
|
||||
Dim oLookupRows As Integer = lookup.Properties.SelectedValues.Count
|
||||
@@ -7146,13 +7149,20 @@ Public Class frmValidator
|
||||
End If
|
||||
End If
|
||||
Else
|
||||
|
||||
' Single-Select Lookup
|
||||
oMyInput = lookup.Properties.SelectedValues.FirstOrDefault()
|
||||
If IsNothing(oMyInput) And oIsRequired = True Then
|
||||
oMissing = True
|
||||
oErrMsgMissingInput = $"Could not get FirstOrDefault-Value of LookUpGrid! - LookUPGridName: {lookup.Name}"
|
||||
MyValidationLogger.Warn(oErrMsgMissingInput)
|
||||
Exit For
|
||||
If pRegularComplete = False Then
|
||||
MyValidationLogger.Debug($"[CHECK_UPDATE] LookupGrid(SingleSelect) '{lookup.Name}' is required but has no selection. Skipping due to pRegularComplete=False.")
|
||||
Continue For
|
||||
Else
|
||||
oMissing = True
|
||||
oErrMsgMissingInput = $"Could not get FirstOrDefault-Value of LookUpGrid! - LookUPGridName: {lookup.Name}"
|
||||
MyValidationLogger.Warn(oErrMsgMissingInput)
|
||||
OpenfrmError(oErrMsgMissingInput)
|
||||
Exit For
|
||||
End If
|
||||
ElseIf IsNothing(oMyInput) And oIsRequired = False Then
|
||||
For Each ochangedLookub In listChangedLookup
|
||||
If lookup.Name = ochangedLookub Then
|
||||
@@ -7284,12 +7294,17 @@ Public Class frmValidator
|
||||
End If
|
||||
|
||||
If Check_Missing_Control_Value(oControl, "txt") = True And oIsRequired = True Then
|
||||
oMissing = True
|
||||
oErrMsgMissingInput = oWrongInputMessage & " textbox '" & oControl.Name & "'"
|
||||
MyValidationLogger.Warn(oErrMsgMissingInput)
|
||||
oControl.BackColor = Color.Red
|
||||
frmError.ShowDialog()
|
||||
Exit For
|
||||
If pRegularComplete = False Then
|
||||
MyValidationLogger.Debug($"[CHECK_UPDATE] TextEdit '{oControl.Name}' is required but has no selection. Skipping due to pRegularComplete=False.")
|
||||
Continue For
|
||||
Else
|
||||
oMissing = True
|
||||
oErrMsgMissingInput = oWrongInputMessage & " textbox '" & oControl.Name & "'"
|
||||
MyValidationLogger.Warn(oErrMsgMissingInput)
|
||||
oControl.BackColor = Color.Red
|
||||
frmError.ShowDialog()
|
||||
Exit For
|
||||
End If
|
||||
Else
|
||||
MyValidationLogger.Debug("Reading current value from Textbox")
|
||||
Dim oTextEdit As BaseEdit = DirectCast(oControl, BaseEdit)
|
||||
@@ -7414,15 +7429,20 @@ Public Class frmValidator
|
||||
MyValidationLogger.Debug($"Working on Combobox...")
|
||||
Dim cmb As Windows.Forms.ComboBox = oControl
|
||||
If cmb.SelectedIndex = -1 And oIsRequired = True Then
|
||||
oMissing = True
|
||||
oErrMsgMissingInput = "Please Choose an entry out of ComboBox '" & cmb.Name & "'"
|
||||
MyValidationLogger.Warn(oErrMsgMissingInput)
|
||||
If _FormClosing Then
|
||||
MyValidationLogger.Warn("Form closing - skip error dialog")
|
||||
Return False
|
||||
If pRegularComplete = False Then
|
||||
MyValidationLogger.Debug($"[CHECK_UPDATE] ComboBox '{cmb.Name}' is required but has no selection. Skipping due to pRegularComplete=False.")
|
||||
Continue For
|
||||
Else
|
||||
oMissing = True
|
||||
oErrMsgMissingInput = "Please Choose an entry out of ComboBox '" & cmb.Name & "'"
|
||||
MyValidationLogger.Warn(oErrMsgMissingInput)
|
||||
If _FormClosing Then
|
||||
MyValidationLogger.Warn("Form closing - skip error dialog")
|
||||
Return False
|
||||
End If
|
||||
OpenfrmError(oErrMsgMissingInput)
|
||||
Exit For
|
||||
End If
|
||||
OpenfrmError(oErrMsgMissingInput)
|
||||
Exit For
|
||||
Else
|
||||
oMyInput = cmb.Text
|
||||
MyValidationLogger.Debug($"inputvalue Combobox: {cmb.Text}")
|
||||
@@ -7549,15 +7569,20 @@ Public Class frmValidator
|
||||
Try
|
||||
Dim dtp As DateTimePicker = oControl
|
||||
If oIsRequired = True And dtp.Value.ToString = String.Empty Then
|
||||
oMissing = True
|
||||
oErrMsgMissingInput = "Please Choose DateValue for field'" & dtp.Name & "'"
|
||||
MyValidationLogger.Warn(oErrMsgMissingInput)
|
||||
If _FormClosing Then
|
||||
MyValidationLogger.Warn("Form closing - skip error dialog")
|
||||
Return False
|
||||
If pRegularComplete = False Then
|
||||
MyValidationLogger.Debug($"[CHECK_UPDATE] DateTimePicker '{dtp.Name}' is required but has no selection. Skipping due to pRegularComplete=False.")
|
||||
Continue For
|
||||
Else
|
||||
oMissing = True
|
||||
oErrMsgMissingInput = "Please Choose DateValue for field'" & dtp.Name & "'"
|
||||
MyValidationLogger.Warn(oErrMsgMissingInput)
|
||||
If _FormClosing Then
|
||||
MyValidationLogger.Warn("Form closing - skip error dialog")
|
||||
Return False
|
||||
End If
|
||||
OpenfrmError(oErrMsgMissingInput)
|
||||
Exit For
|
||||
End If
|
||||
OpenfrmError(oErrMsgMissingInput)
|
||||
Exit For
|
||||
ElseIf dtp.Value.ToString <> "01.01.0001 00:00:00" Then
|
||||
oMyInput = CDate(dtp.Value)
|
||||
Dim oObjectValue
|
||||
@@ -7645,15 +7670,20 @@ Public Class frmValidator
|
||||
oMyInput = chk.Checked.ToString
|
||||
|
||||
If chk.CheckState = CheckState.Indeterminate And oIsRequired = True Then
|
||||
oMissing = True
|
||||
oErrMsgMissingInput = "Please set Checkbox value for field '" & chk.Name & "'"
|
||||
MyValidationLogger.Warn(oErrMsgMissingInput)
|
||||
If _FormClosing Then
|
||||
MyValidationLogger.Warn("Form closing - skip error dialog")
|
||||
Return False
|
||||
If pRegularComplete = False Then
|
||||
MyValidationLogger.Debug($"[CHECK_UPDATE] CheckBox '{chk.Name}' is required but has no selection. Skipping due to pRegularComplete=False.")
|
||||
Continue For
|
||||
Else
|
||||
oMissing = True
|
||||
oErrMsgMissingInput = "Please set Checkbox value for field '" & chk.Name & "'"
|
||||
MyValidationLogger.Warn(oErrMsgMissingInput)
|
||||
If _FormClosing Then
|
||||
MyValidationLogger.Warn("Form closing - skip error dialog")
|
||||
Return False
|
||||
End If
|
||||
OpenfrmError(oErrMsgMissingInput)
|
||||
Exit For
|
||||
End If
|
||||
OpenfrmError(oErrMsgMissingInput)
|
||||
Exit For
|
||||
End If
|
||||
|
||||
Dim WertWD As String
|
||||
@@ -7763,15 +7793,20 @@ Public Class frmValidator
|
||||
End If
|
||||
Next
|
||||
If oIsRequired = True And Zeilen = 0 Then
|
||||
oMissing = True
|
||||
oErrMsgMissingInput = "Fehlende Eingabe in Vektorfeld '" & dgv.Name & "'"
|
||||
MyValidationLogger.Warn(oErrMsgMissingInput)
|
||||
If _FormClosing Then
|
||||
MyValidationLogger.Warn("Form closing - skip error dialog")
|
||||
Return False
|
||||
If pRegularComplete = False Then
|
||||
MyValidationLogger.Debug($"[CHECK_UPDATE] DataGridView '{dgv.Name}' is required but has no selection. Skipping due to pRegularComplete=False.")
|
||||
Continue For
|
||||
Else
|
||||
oMissing = True
|
||||
oErrMsgMissingInput = "Fehlende Eingabe in Vektorfeld '" & dgv.Name & "'"
|
||||
MyValidationLogger.Warn(oErrMsgMissingInput)
|
||||
If _FormClosing Then
|
||||
MyValidationLogger.Warn("Form closing - skip error dialog")
|
||||
Return False
|
||||
End If
|
||||
OpenfrmError(oErrMsgMissingInput)
|
||||
Exit For
|
||||
End If
|
||||
OpenfrmError(oErrMsgMissingInput)
|
||||
Exit For
|
||||
ElseIf Zeilen > 0 Then
|
||||
Dim ZeilenGrid As Integer = 0
|
||||
Dim myVektorArr As String()
|
||||
@@ -8253,9 +8288,8 @@ Public Class frmValidator
|
||||
|
||||
Try
|
||||
MyValidationLogger.Debug("Skipping document....(Datei_ueberspringen)")
|
||||
Dim oPRoc = String.Format("EXEC PRTF_PROFILE_FILES_WORK {0},{1},{2},{3}", CURRENT_DOC_ID, CURRENT_ProfilGUID, USER_ID, "FreeFile")
|
||||
Dim oSQL = oPRoc & vbCrLf &
|
||||
$"EXECUTE PRPM_FILES_NOT_INDEXED '{USER_USERNAME}',{CURRENT_ProfilGUID},'{DocPathWindows}',{CURRENT_DOC_GUID};"
|
||||
PRTF_PROFILE_FILES_WORK("FreeFile")
|
||||
Dim oSQL = $"EXECUTE PRPM_FILES_NOT_INDEXED '{USER_USERNAME}',{CURRENT_ProfilGUID},'{DocPathWindows}',{CURRENT_DOC_GUID};"
|
||||
If LOG_HOTSPOTS Then
|
||||
' ========== DIAGNOSE: Vor DB-Execute ==========
|
||||
MyValidationLogger.Info($"[INFO] Führe DB-UPDATE aus...")
|
||||
@@ -8308,8 +8342,13 @@ Public Class frmValidator
|
||||
End Sub
|
||||
Private Function PRTF_PROFILE_FILES_WORK(ByVal pMode As String) As Boolean
|
||||
Try
|
||||
Dim sql = $"EXEC PRTF_PROFILE_FILES_WORK {CURRENT_DOC_ID},{CURRENT_ProfilGUID},{USER_ID},'{pMode}'"
|
||||
Return DatabaseFallback.ExecuteNonQueryECM(sql)
|
||||
If CURRENT_DOC_ID <> 0 Then
|
||||
Dim sql = $"EXEC PRTF_PROFILE_FILES_WORK {CURRENT_DOC_ID},{CURRENT_ProfilGUID},{USER_ID},'{pMode}'"
|
||||
Return DatabaseFallback.ExecuteNonQueryECM(sql)
|
||||
Else
|
||||
Return False
|
||||
End If
|
||||
|
||||
Catch ex As Exception
|
||||
MyValidationLogger.Error(ex)
|
||||
Return False
|
||||
@@ -8701,7 +8740,7 @@ Public Class frmValidator
|
||||
ShowOverlaySafe() ' ✅ Overlay hier öffnen
|
||||
Try
|
||||
' ========== FIX 2: Nur EINEN Check-Aufruf ==========
|
||||
If Check_UpdateIndexe() = True Then
|
||||
If Check_UpdateIndexe(False) = True Then
|
||||
SetStatusLabel("Data saved", "LimeGreen")
|
||||
MyValidationLogger.Info("Workflowdata saved manually!")
|
||||
|
||||
@@ -8936,6 +8975,7 @@ Public Class frmValidator
|
||||
oNoError = IDBData.SetVariableValue(PROFIL_REJECT_COMMENT_ATTRIBUTE, frmRejCommit.pRejection_Comment)
|
||||
End If
|
||||
End If
|
||||
PRTF_PROFILE_FILES_WORK("FreeFile")
|
||||
If oNoError Then
|
||||
REJECTION_ACTIVE = True
|
||||
If Check_UpdateIndexe() = True Then
|
||||
@@ -9015,7 +9055,7 @@ Public Class frmValidator
|
||||
' End If
|
||||
' End If
|
||||
'Next
|
||||
|
||||
PRTF_PROFILE_FILES_WORK("FreeFile")
|
||||
|
||||
If IDB_ACTIVE = False Then
|
||||
Indexiere_File(CURRENT_WMFILE, PROFIL_NOT_RESP_COMMENT_ATTR, frmDialog.oComment)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user