AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://172.24.11.74:90/scm/git/RecordOrganizer

Browse Source
This commit is contained in:
Jonathan Jenne 2017-10-25 15:03:54 +02:00
commit 88d2300bca
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/DD-Record-Organizer/ClassControlCommandsUI.vb
View File

@ -843,6 +843,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

4
app/DD-Record-Organizer/ClassHelper.vb
View File

@ -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"

2
app/DD-Record-Organizer/My Project/AssemblyInfo.vb
View File

@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.4.9.3")>
<Assembly: AssemblyVersion("2.4.9.4")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguageAttribute("")>

10
app/DD-Record-Organizer/frmConstructor_Main.vb
View File

@ -2007,7 +2007,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
@ -2848,7 +2848,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
@ -5201,7 +5201,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"
@ -5346,7 +5346,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
@ -6473,7 +6473,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