diff --git a/app/DD-Record-Organiser/ClassControlBuilder.vb b/app/DD-Record-Organiser/ClassControlBuilder.vb index d38fe50..1384159 100644 --- a/app/DD-Record-Organiser/ClassControlBuilder.vb +++ b/app/DD-Record-Organiser/ClassControlBuilder.vb @@ -301,7 +301,9 @@ Public Class ClassControlBuilder If Not IsNothing(ctrlvalID) Then Dim upd1 = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}',CHANGE_STEP = {1},CHANGED_WHO = '{2}' WHERE CONTROL_ID = {3} AND RECORD_ID = {4}", _ value.ToString, CURRENT_CHANGE_STEP, Environment.UserName, CONTROL_ID, CURRENT_RECORD_ID) - ClassDatabase.Execute_non_Query(upd1) + If ClassDatabase.Execute_non_Query(upd1, True) = False Then + + End If Else If CURRENT_RECORD_ID <> 0 Then Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", CONTROL_ID, CURRENT_RECORD_ID, value, Environment.UserName) @@ -349,7 +351,7 @@ Public Class ClassControlBuilder If Not IsNothing(id) Then Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", dateValue, Environment.UserName, id) - If ClassDatabase.Execute_non_Query(upd) = True Then + If ClassDatabase.Execute_non_Query(upd, True) = True Then If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was not nothing - Updated the ControlValue '" & upd) Else ClassLogger.Add(" >> Check Update depending control value as it was nothing and Update was not successful - Update-Command '" & upd & "'") @@ -404,7 +406,7 @@ Public Class ClassControlBuilder If Not IsNothing(id) Then Dim upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}', CHANGED_WHO = '{1}' WHERE GUID = {2}", value1, Environment.UserName, id) - If ClassDatabase.Execute_non_Query(upd) = True Then + If ClassDatabase.Execute_non_Query(upd, True) = True Then If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was not nothing - Updated the ControlValue '" & upd) Else ClassLogger.Add(" >> Check Update depending control value as it was nothing and Update was not successful - Update-Command '" & upd & "'") diff --git a/app/DD-Record-Organiser/ClassControlCommandsUI.vb b/app/DD-Record-Organiser/ClassControlCommandsUI.vb index 94fb3d9..b2d6af1 100644 --- a/app/DD-Record-Organiser/ClassControlCommandsUI.vb +++ b/app/DD-Record-Organiser/ClassControlCommandsUI.vb @@ -441,7 +441,7 @@ Public Class ClassControlCommandsUI SQL = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (RECORD_ID, CONTROL_ID, VALUE, ADDED_WHO) VALUES ({0}, {1}, '{2}', '{3}')", RecordID, ControlID, VALUE, Environment.UserName) End If - ClassDatabase.Execute_non_Query(SQL) + ClassDatabase.Execute_non_Query(SQL, True) Catch ex As Exception MsgBox("Error in LinkImage: " & vbNewLine & ex.Message) End Try @@ -974,7 +974,7 @@ Public Class ClassControlCommandsUI 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) + Return ClassDatabase.Execute_non_Query(upd, True) '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 diff --git a/app/DD-Record-Organiser/ClassFunctionCommands.vb b/app/DD-Record-Organiser/ClassFunctionCommands.vb index 4df6496..bfa6dc5 100644 --- a/app/DD-Record-Organiser/ClassFunctionCommands.vb +++ b/app/DD-Record-Organiser/ClassFunctionCommands.vb @@ -106,7 +106,7 @@ Return InsertValue(ControlID, RecordID, Value) Else SQL = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}',CHANGED_WHO = '{1}' WHERE CONTROL_ID = {2} AND RECORD_ID = {3}", Value, Environment.UserName, ControlID, RecordID) - If ClassDatabase.Execute_non_Query(SQL) = True Then + If ClassDatabase.Execute_non_Query(SQL, True) = True Then Return True Else : Return False End If diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb index dc312c2..16b396d 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb @@ -1053,7 +1053,7 @@ Partial Class frmConstructorDesigner ' resources.ApplyResources(Me.cmbRight, "cmbRight") Me.cmbRight.FormattingEnabled = True - Me.cmbRight.Items.AddRange(New Object() {resources.GetString("cmbRight.Items"), resources.GetString("cmbRight.Items1"), resources.GetString("cmbRight.Items2")}) + Me.cmbRight.Items.AddRange(New Object() {resources.GetString("cmbRight.Items"), resources.GetString("cmbRight.Items1")}) Me.cmbRight.Name = "cmbRight" ' 'btnDeleteUserSupervisor diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.resx b/app/DD-Record-Organiser/frmConstructorDesigner.resx index cba1393..a859cf1 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.resx +++ b/app/DD-Record-Organiser/frmConstructorDesigner.resx @@ -1129,7 +1129,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - CQAAAk1TRnQBSQFMAgEBAgEAATwBDAE8AQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAUQBDAFEAQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -2661,10 +2661,7 @@ Admin - Read/Write/Rights - - - + Read/Write 395, 59 @@ -2996,7 +2993,7 @@ 102 - 272, 121 + 272, 104 89 @@ -3026,7 +3023,7 @@ NoControl - 283, -10 + 283, -27 132, 15 @@ -3062,7 +3059,7 @@ NoControl - 536, -10 + 536, -27 55, 15 @@ -3089,7 +3086,7 @@ Bottom, Left - 539, 8 + 539, -9 449, 140 @@ -3128,7 +3125,7 @@ False - 287, 8 + 287, -9 246, 140 @@ -3161,7 +3158,7 @@ NoControl - 733, -26 + 733, -43 255, 31 diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.vb b/app/DD-Record-Organiser/frmConstructorDesigner.vb index 83549d3..6ff4c21 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.vb +++ b/app/DD-Record-Organiser/frmConstructorDesigner.vb @@ -920,8 +920,8 @@ Public Class frmConstructorDesigner Select Case cmbRight.Text Case "Admin" right = "4" - Case "Read/Write/Rights" - right = "6" + Case "Read/Write" + right = "3" End Select Dim sel = String.Format("SELECT COUNT(GUID) FROM TBPMO_ENTITY_SUPERVISOR WHERE ENTITY_ID = {0} AND USER_ID = {1}", SELECTED_ENTITY_ID, row.Item(5))