MS19052016_1

app/DD-Record-Organiser/frmConstructor_Main.vb

@@ -157,7 +157,7 @@ Public Class frmConstructor_Main
     End Sub
 
     Private Sub frmForm_Constructor_Main_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
-        If RECORD_CHANGED Then
+        If RECORD_CHANGED = True Then
             Dim ResultMessage As String
             Try
                 ResultMessage = Update_Record_OnChange()
@@ -694,7 +694,7 @@ Public Class frmConstructor_Main
     End Function
 
     Private Sub grvwGrid_BeforeLeaveRow(sender As Object, e As RowAllowEventArgs) Handles grvwGrid.BeforeLeaveRow
-        If RECORD_CHANGED Then
+        If RECORD_CHANGED = True Then
             Dim ResultMessage As String
             Try
                 ResultMessage = Update_Record_OnChange()
@@ -1404,6 +1404,7 @@ Public Class frmConstructor_Main
                     Me.Cursor = Cursors.Default
                     Return True
                 End If
+              
             End If
             'Update aller Control-Werte
             Dim ResultMessage
@@ -1586,7 +1587,7 @@ Public Class frmConstructor_Main
         If RECORD_ENABLED = False Then
             EnableEditMode()
         Else
-            If RECORD_CHANGED Then
+            If RECORD_CHANGED = True Then
                 Dim ResultMessage As String
                 Try
                     ResultMessage = Update_Record_OnChange()
@@ -1623,11 +1624,14 @@ Public Class frmConstructor_Main
             'Wenn Record bearbeitet werden kann, IN_WORK auf 1 setzen, um Bearbeitung durch andere zu verhindern!
             ClassRecordState.LockRecord(SELECTED_RECORD_ID)
         End If
-
+        CURRENT_CHANGE_STEP += 1
+        Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE_CHANGE_HISTORY WHERE UPPER(ADDED_WHO) = '{0}'", Environment.UserName.ToUpper)
+        ClassDatabase.Execute_non_Query(del)
         Lock_RecordControls(False)
         tsmi_RecordDelete.Enabled = True
         Me.tsButtonAdd.Enabled = True
         Me.tsButtonSave.Enabled = True
+        tsbtnRedo.Visible = True
         Dim stg As String
         If USER_LANGUAGE = "de-DE" Then
             stg = "Bearbeiten beenden"
@@ -1657,7 +1661,7 @@ Public Class frmConstructor_Main
 
     Sub DisableEditMode()
         ClassRecordState.UnlockRecord(SELECTED_RECORD_ID)
-
+        tsbtnRedo.Visible = False
         Lock_RecordControls(True)
         RECORD_ENABLED = False
         CURRENT_RECORD_ENABLED = False
@@ -5107,4 +5111,15 @@ Public Class frmConstructor_Main
             Console.WriteLine("Focus panel")
         End If
     End Sub
+
+    Private Sub tsbtnRedo_Click(sender As Object, e As EventArgs) Handles tsbtnRedo.Click
+        Me.Cursor = Cursors.WaitCursor
+        Dim proc = String.Format("EXEC PRPMO_REDO_RECORD_CHANGES {0}", RECORD_ID)
+        If ClassDatabase.Execute_non_Query(proc) = True Then
+            RECORD_ID = 0
+            Column_Row_Handler()
+            Me.Cursor = Cursors.Default
+        End If
+       
+    End Sub
 End Class