diff --git a/app/DD-Record-Organizer/ClassControlCommandsUI.vb b/app/DD-Record-Organizer/ClassControlCommandsUI.vb index f63bb28..19d57cf 100644 --- a/app/DD-Record-Organizer/ClassControlCommandsUI.vb +++ b/app/DD-Record-Organizer/ClassControlCommandsUI.vb @@ -821,6 +821,7 @@ Public Class ClassControlCommandsUI Dim AddedWho = USER_USERNAME Dim converted_value = Check_and_Format_Value(ControlID, RecordID, Value) If Not IsNothing(converted_value) Then + converted_value = converted_value.Replace("'", "´") Dim ins As String = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES ({0}, {1}, '{2}', '{3}')", ControlID, RecordID, converted_value, AddedWho) If LICENSE_PROXY = True Or clsDatabase.DB_PROXY_INITIALIZED = True Then If ClassDatabase.Execute_non_Query(ins) = True Then diff --git a/app/DD-Record-Organizer/ClassDatabase.vb b/app/DD-Record-Organizer/ClassDatabase.vb index f0bc032..6ce1387 100644 --- a/app/DD-Record-Organizer/ClassDatabase.vb +++ b/app/DD-Record-Organizer/ClassDatabase.vb @@ -85,7 +85,7 @@ Public Class ClassDatabase Return dt Catch ex As Exception MsgBox("Error in Return_Datatable: " & ex.Message & vbNewLine & vbNewLine & Select_anweisung, MsgBoxStyle.Critical) - ClassHelper.InsertEssential_Log(CURRENT_RECORD_ID, "RECORD-ID", ex.Message & " - SQL: " & Select_anweisung + ClassHelper.InsertEssential_Log(CURRENT_RECORD_ID, "RECORD-ID", ex.Message & " - SQL: " & Select_anweisung) ClassLogger.Add("Error in Return_Datatable: " & ex.Message, True) ClassLogger.Add(">> SQL: " & Select_anweisung, False) If (ex.Message.Contains("Ungültiger Objektname") Or ex.Message.Contains("Invalid Object Name")) And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then diff --git a/app/DD-Record-Organizer/ClassHelper.vb b/app/DD-Record-Organizer/ClassHelper.vb index 1321d56..08b5420 100644 --- a/app/DD-Record-Organizer/ClassHelper.vb +++ b/app/DD-Record-Organizer/ClassHelper.vb @@ -248,9 +248,9 @@ Public Class ClassHelper Return False End Try End Function - Public Shared Function DeleteRecord(ByVal SELECTED_RECORD_ID) + Public Shared Function DeleteRecord(SELECTED_RECORD_ID As Integer, Optional Comment As String = "") Try - Dim DeleteRecordSQL = String.Format("EXEC [dbo].[PRPMO_DELETE_RECORD] {0}, '{1}'", SELECTED_RECORD_ID, USER_USERNAME) + Dim DeleteRecordSQL = String.Format("EXEC [dbo].[PRPMO_DELETE_RECORD] {0}, '{1}','{2}'", SELECTED_RECORD_ID, USER_USERNAME, Comment) Dim result As Boolean = ClassDatabase.Execute_non_Query_withConn(DeleteRecordSQL, 1) If result = False Then Dim msg = "Der Datensatz '" & SELECTED_RECORD_ID & "' konnte nicht gelöscht werden. Überprüfen Sie das log" diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index bfb3fb5..4d16c66 100644 --- a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index 4786a92..0e38cf3 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -2005,7 +2005,7 @@ Public Class frmConstructor_Main If IsNothing(DT_DOC_RESULT) Then ClassLogger.Add(">> DT_DOC_RESULT is nothing!", True) End If - If ClassHelper.DeleteRecord(SELECTED_RECORD_ID) = True Then + If ClassHelper.DeleteRecord(SELECTED_RECORD_ID, "DELETE_RECORD - UserDecidedYes") = True Then RECORD_CHANGED = False EDIT_STATE = EditState.None CURRENT_RECORD_ENABLED = False @@ -2846,7 +2846,7 @@ Public Class frmConstructor_Main End Try Else If CtrlCommandUI.IsInsert = True Then ' Wenn nicht gespeichert werden soll, den Record wieder löschen - ClassHelper.DeleteRecord(SELECTED_RECORD_ID) + ClassHelper.DeleteRecord(SELECTED_RECORD_ID, "USER DECIDED NOT TO SAVE") End If tsButtonAdd.Enabled = True End If @@ -5200,7 +5200,7 @@ Public Class frmConstructor_Main Private Sub tsButtonCancel_Click(sender As Object, e As EventArgs) Handles tsButtonCancel.Click If CtrlCommandUI.IsInsert = True Then - If ClassHelper.DeleteRecord(SELECTED_RECORD_ID) = False Then + If ClassHelper.DeleteRecord(SELECTED_RECORD_ID, "DELETE DURING INSERT(Hit Cancel)") = False Then Dim msg = "Der Datensatz '" & SELECTED_RECORD_ID & "' konnte nicht gelöscht werden. Überprüfen Sie das log" If USER_LANGUAGE <> "de-DE" Then msg = "The record '" & SELECTED_RECORD_ID & "' could not be deleted. Check the log" @@ -5345,7 +5345,7 @@ Public Class frmConstructor_Main Else ' Änderungen sollen nicht gespeichert werden ' Angelegten Record löschen If CtrlCommandUI.IsInsert Then - ClassHelper.DeleteRecord(SELECTED_RECORD_ID) + ClassHelper.DeleteRecord(SELECTED_RECORD_ID, "TrySave - UserdecidedNotToSave") End If ' Änderungen sollen nicht gespeichert werden @@ -6470,7 +6470,7 @@ Public Class frmConstructor_Main Dim delete = String.Format("DELETE FROM TBPMO_STRUCTURE_NODES WHERE GUID = {0}", NODE_GUID) If ClassDatabase.Execute_non_Query(delete) Then If REC_Exists = True Then - If ClassHelper.DeleteRecord(SELECTED_RECORD_ID) = True Then + If ClassHelper.DeleteRecord(SELECTED_RECORD_ID, "NodeDelete-Click") = True Then ClassHelper.InsertEssential_Log(SELECTED_RECORD_ID, "RECORD-ID", "RECORD WAS DELETED MANUALLY by USER: " & USER_USERNAME) TreeViewMain.Nodes.Remove(TreeViewMain.SelectedNode) End If