Compare commits
2 Commits
ffa97402ff
...
966d3f404d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
966d3f404d | ||
|
|
0e2bef27a4 |
@@ -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
|
||||
|
||||
|
||||
@@ -589,7 +589,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")
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -814,7 +814,8 @@ Public Class frmValidator
|
||||
Try
|
||||
Dim oSQL As String
|
||||
oSQL = $"DELETE FROM TBPM_DOCWALKOVER WHERE UserID = {USER_ID};" & vbCrLf &
|
||||
$"DELETE FROM TBPM_VALIDATION_PROFILE_GROUP_USER WHERE UserID = {USER_ID};"
|
||||
$"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)
|
||||
@@ -5807,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")
|
||||
|
||||
Reference in New Issue
Block a user