MS19052016_1

app/DD-Record-Organiser/ClassControlCommandsUI.vb

@@ -494,7 +494,9 @@ Public Class ClassControlCommandsUI
     Private Sub UpdateAllControls(FormID As Integer, RecordID As Integer, controls As Control.ControlCollection)
         Try
             Dim sw As New SW("UpdateAllControls")
-
+            Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE_CHANGE_HISTORY WHERE UPPER(ADDED_WHO) = '{0}'", Environment.UserName.ToUpper)
+            ClassDatabase.Execute_non_Query(del)
+            CURRENT_CHANGE_STEP += 1
             Dim VALUE_EXISTS_DT As DataTable = ClassDatabase.Return_Datatable(String.Format("SELECT RECORD_ID, CONTROL_ID FROM VWPMO_VALUES WHERE RECORD_ID = {0}", RecordID))
 
             For Each ctrl As Control In controls
@@ -581,8 +583,17 @@ Public Class ClassControlCommandsUI
 
             Dim AddValues = values.Except(oldValues)
             Dim RemoveValues = oldValues.Except(values)
+            Dim FORMAT_TYPE As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE FROM TBPMO_CONTROL WHERE GUID = " & ControlId)
 
             For Each v As String In AddValues
+                If Not v = String.Empty Then
+                    Select Case FORMAT_TYPE
+                        Case "Currency"
+                            v = Decimal.Parse(v, Globalization.NumberStyles.Currency).ToString
+                        Case "Decimal"
+                            v = Decimal.Parse(v, Globalization.NumberStyles.Integer)
+                    End Select
+                End If
                 ClassDatabase.Execute_non_Query(String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE) VALUES({0}, {1}, '{2}')", ControlId, RecordId, v))
             Next
 
@@ -795,28 +806,36 @@ Public Class ClassControlCommandsUI
     Public Shared Function UpdateControlValue(ControlID As Integer, RecordID As Integer, Value As String)
         Try
             Dim CHANGED_WHO = Environment.UserName
-            Dim FORMAT_TYPE As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE FROM TBPMO_CONTROL WHERE GUID = " & ControlID)
+            Dim DT_FORMAT_TYPE As DataTable = ClassDatabase.Return_Datatable("SELECT FORMAT_TYPE,CONTROL_TYPE_ID FROM TBPMO_CONTROL WHERE GUID = " & ControlID)
+            Dim FORMAT_TYPE As String = ClassDatabase.Execute_Scalar("SELECT FORMAT_TYPE,CONTROL_TYPE_ID FROM TBPMO_CONTROL WHERE GUID = " & ControlID)
 
             If Not Value = String.Empty Then
-                Select Case FORMAT_TYPE
+                Select Case DT_FORMAT_TYPE.Rows(0).Item(0).ToString ' FORMAT_TYPE
                     Case "Currency"
                         Value = Decimal.Parse(Value, Globalization.NumberStyles.Currency).ToString
                     Case "Decimal"
                         Value = Decimal.Parse(Value, Globalization.NumberStyles.Integer)
                 End Select
+                Select Case DT_FORMAT_TYPE.Rows(0).Item(1)
+                    Case 4 'DateEdit
+                        Value = CDate(Value)
+                End Select
             End If
 
-            Using conn As New SqlClient.SqlConnection(MyConnectionString)
-                Dim cmd As New SqlClient.SqlCommand("UPDATE TBPMO_CONTROL_VALUE SET VALUE = @VALUE, CHANGED_WHO = @CHANGED_WHO WHERE CONTROL_ID = @CONTROL_ID AND RECORD_ID = @RECORD_ID", conn)
-                cmd.Parameters.Add("@VALUE", SqlDbType.NVarChar).Value = Value
-                cmd.Parameters.Add("@CHANGED_WHO", SqlDbType.VarChar).Value = CHANGED_WHO
-                cmd.Parameters.Add("@CONTROL_ID", SqlDbType.Int).Value = ControlID
-                cmd.Parameters.Add("@RECORD_ID", SqlDbType.Int).Value = RecordID
-
-                conn.Open()
-                cmd.ExecuteNonQuery()
-                Return True
-            End Using
+            Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}', CHANGE_STEP = {2} WHERE CONTROL_ID = {3} AND RECORD_ID = {4}", _
+                                    Value, CHANGED_WHO, CURRENT_CHANGE_STEP, ControlID, RecordID)
+           Return ClassDatabase.Execute_non_Query(upd)
+            'Using conn As New SqlClient.SqlConnection(MyConnectionString)
+            '    Dim cmd As New SqlClient.SqlCommand("UPDATE TBPMO_CONTROL_VALUE SET VALUE = @VALUE, CHANGED_WHO = @CHANGED_WHO, CHANGE_STEP = @CHANGE_STEP WHERE CONTROL_ID = @CONTROL_ID AND RECORD_ID = @RECORD_ID", conn)
+            '    cmd.Parameters.Add("@VALUE", SqlDbType.NVarChar).Value = Value
+            '    cmd.Parameters.Add("@CHANGED_WHO", SqlDbType.VarChar).Value = CHANGED_WHO
+            '    cmd.Parameters.Add("@CONTROL_ID", SqlDbType.Int).Value = ControlID
+            '    cmd.Parameters.Add("@RECORD_ID", SqlDbType.Int).Value = RecordID
+            '    cmd.Parameters.Add("CHANGE_STEP", SqlDbType.Int).Value = CURRENT_CHANGE_STEP
+            '    conn.Open()
+            '    cmd.ExecuteNonQuery()
+            '    Return True
+            'End Using
 
         Catch ex As Exception
             ClassLogger.Add("Unerwarteter Fehler in UpdateControlValue: " & ex.Message, True)