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

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

Browse Source
This commit is contained in:
JenneJ
2016-11-09 11:16:02 +01:00
parent b96fa6fe69 5cb29f2d7d
commit 8f6d151f3a
7 changed files with 1561 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/DD-Record-Organiser/frmConstructor_Main.vb
View File

@@ -1946,6 +1946,10 @@ Public Class frmConstructor_Main
Dim result As MsgBoxResult
result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
If result = MsgBoxResult.Yes Then
Dim DT_DOC_RESULT As DataTable = ClassDOC_SEARCH.Get_DOCRESULTS(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, "RECORD")
If IsNothing(DT_DOC_RESULT) Then
clsLogger.Add(">> DT_DOC_RESULT is nothing!", True)
End If
If ClassHelper.DeleteRecord(SELECTED_RECORD_ID) = True Then
RECORD_CHANGED = False
EDIT_STATE = EditState.None
@@ -1958,7 +1962,7 @@ Public Class frmConstructor_Main
End If
Update_Status_Label(True, msg, EditState.Update)
WD_DELETE_DOCS()
WD_DELETE_DOCS(DT_DOC_RESULT)
@@ -3562,16 +3566,15 @@ Public Class frmConstructor_Main
End Sub
Private Sub WD_DELETE_DOCS()
Private Sub WD_DELETE_DOCS(DT_RESULT As Datatable)
Dim sw As New Stopwatch
sw.Start()
Dim elapsed As Double
' Dim Basesearch As String
Try
Dim DT_RESULT As DataTable = ClassDOC_SEARCH.Get_DOC_RESULTTABLE(DT_RESULTLIST_OPTIONS, DT_RESULTLIST_VARIABLE_VALUE, DT_WINDREAM_RESULTLIST, ENTITY_ID, RECORD_ID, "RECORD")
If IsNothing(DT_RESULT) Then
Exit Sub
Else
If Not IsNothing(DT_RESULT) Then
If DT_RESULT.Rows.Count > 0 Then 'Es gibt Suchergebnisse
Dim msg As String
msg = "Wollen Sie die zugehörigen Dateien (" & DT_RESULT.Rows.Count.ToString & ") ebenfalls löschen?"
@@ -3583,7 +3586,12 @@ Public Class frmConstructor_Main
If result1 = MsgBoxResult.Yes Then
For Each row As DataRow In DT_RESULT.Rows
Dim DOC_ID = row.Item("DocID")
Dim path = row.Item("FULLPATH")
Dim path
Try
path = row.Item("FULL_FILENAME")
Catch ex As Exception
path = row.Item(1)
End Try
If Not IsNothing(path) Then
Dim Count As Integer = ClassDatabase.Execute_Scalar("SELECT COUNT(GUID) FROM TBPMO_DOC_RECORD_LINK WHERE DOC_ID = " & DOC_ID)
If Count > 1 Then
@@ -3593,7 +3601,7 @@ Public Class frmConstructor_Main
End If
MsgBox(msg, MsgBoxStyle.Information)
If ClassFileResult.Delete_ResultFile(DOC_ID, RECORD_ID, 0) = False Then
ClassHelper.InsertEssential_Log(row.Item("DOC_ID"), "DOC-ID", "FILE LINK DELETED BY USER")
ClassHelper.InsertEssential_Log(DOC_ID, "DOC-ID", "FILE LINK DELETED BY USER")
End If
Else
If ClassFileResult.Delete_ResultFile(DOC_ID, RECORD_ID, 1) = False Then
@@ -3604,7 +3612,7 @@ Public Class frmConstructor_Main
MsgBox(msg, MsgBoxStyle.Critical, "Attention:")
Else
If ClassWindream.Delete_WDFile(path) Then
ClassHelper.InsertEssential_Log(row.Item("DOC_ID"), "DOC-ID", "FILE DELETED BY USER")
ClassHelper.InsertEssential_Log(DOC_ID, "DOC-ID", "FILE DELETED BY USER")
End If
End If
End If
@@ -3612,8 +3620,9 @@ Public Class frmConstructor_Main
End If
Next
End If
End If
Else
clsLogger.Add(">> No files 2 delete - after deleting record!", False)
End If
Cursor = Cursors.Default
Catch ex As Exception