ms

app/DD_PM_WINDREAM/frmValidator.vb

@@ -3671,6 +3671,14 @@ Public Class frmValidator
         btnSave.Enabled = False
 
         ' TODO: Use when working on Validation
+        If ForceGridValidation() = True Then
+            Finish_WFStep()
+        End If
+
+        btnSave.Enabled = True
+    End Sub
+
+    Private Function ForceGridValidation()
         Dim oValidation As Boolean = True
         Dim oGrids = (From oControl In pnldesigner.Controls
                       Where TypeOf oControl Is GridControl
@@ -3683,26 +3691,19 @@ Public Class frmValidator
                 Continue For
             End If
 
-            For index = 0 To oView.RowCount - 1
-                oView.FocusedRowHandle = index
-
-                If oView.UpdateCurrentRow() = False Then
-                    oValidation = False
-                    Exit For
-                End If
-            Next
+            If oView.UpdateCurrentRow() = False Then
+                oValidation = False
+                Return False
+            End If
 
             If oValidation = False Then
-                Exit For
+                Return False
             End If
         Next
 
-        If oValidation = True Then
-            Finish_WFStep()
-        End If
+        Return True
+    End Function
 
-        btnSave.Enabled = True
-    End Sub
     Private Function btnFinish_continue()
         Try
             Dim oSQL = PROFIL_FINISH_SQL
@@ -5044,8 +5045,7 @@ Public Class frmValidator
         Catch ex As Exception
             LOGGER.Warn($"Unexpected error in Check_UpdateIndexe - ControlID: {oControlId},{oControlName}")
             LOGGER.Error(ex)
-            Dim st As New StackTrace(True)
-            st = New StackTrace(ex, True)
+            Dim st As New StackTrace(ex, True)
             MsgBox($"Unexpected error in Check_UpdateIndexe ControlID,Name: {oControlId},{oControlName}" & vbNewLine & ex.Message & vbNewLine & "Line: " & st.GetFrame(0).GetFileLineNumber().ToString, MsgBoxStyle.Critical, "Error:")
             LOGGER.Info("Unexpected error in Check_UpdateIndexe:" & ex.Message & " - Line: " & st.GetFrame(0).GetFileLineNumber().ToString, True)
             Return False
@@ -5406,11 +5406,16 @@ Public Class frmValidator
     End Sub
 
     Private Sub bbtniNext_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniNext.ItemClick
-        Datei_ueberspringen()
+        If ForceGridValidation() = True Then
+            Datei_ueberspringen()
+        End If
     End Sub
 
     Private Sub bbtniDelete_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniDelete.ItemClick
-        delete_active_File()
+        If ForceGridValidation() = True Then
+            delete_active_File()
+        End If
+
     End Sub
 
     Private Sub bbtniAnnotation_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniAnnotation.ItemClick
@@ -5422,16 +5427,19 @@ Public Class frmValidator
     End Sub
 
     Private Sub BbtnItm_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BbtnItm.ItemClick
-        Dim oRESULT As String
-        If USER_LANGUAGE = "de-DE" Then
-            oRESULT = "Eingaben gespeichert"
-        Else
-            oRESULT = "Eingaben gespeichert"
-        End If
-        If Check_UpdateIndexe() = True Then
-            SetStatusLabel($"Data saved", "LimeGreen")
-        Else
-            SetStatusLabel($"Error while saving data!", "Red")
+        If ForceGridValidation() = True Then
+            Dim oRESULT As String
+
+            If USER_LANGUAGE = "de-DE" Then
+                oRESULT = "Eingaben gespeichert"
+            Else
+                oRESULT = "Eingaben gespeichert"
+            End If
+            If Check_UpdateIndexe() = True Then
+                SetStatusLabel($"Data saved", "LimeGreen")
+            Else
+                SetStatusLabel($"Error while saving data!", "Red")
+            End If
         End If
     End Sub
     Private Sub SaveDevExpressGridControl_Layout(pProfilID As Integer, pControlID As Integer, pGridView As DevExpress.XtraGrid.Views.Grid.GridView)