AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ProcessManager_Client

Browse Source
This commit is contained in:
Jonathan Jenne 2021-03-09 13:24:58 +01:00
commit 6a4ed2cc1c
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb
View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.1.7.0")> <Assembly: AssemblyVersion("2.1.8.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>

12
app/DD_PM_WINDREAM/frmMain.vb
View File

@ -85,7 +85,19 @@ Public Class frmMain
End Try End Try
Return oCHANGED Return oCHANGED
End Function End Function
Private Function Free_File()
Try
Dim sql = $"UPDATE TBPM_PROFILE_FILES SET EDIT = 0, IN_WORK = 0, IN_WORK_WHEN = NULL, WORK_USER = NULL WHERE GUID = {CURRENT_DOC_GUID}"
Return ClassDatabase.Execute_non_Query(sql)
Catch ex As Exception
allgFunk.Insert_LogEntry($"ERROR Free_File >> {ex.Message}")
LOGGER.Error(ex)
Return False
End Try
End Function
Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
Free_File()
Try Try
FormOpenClose = True FormOpenClose = True
' Position und Größe speichern ' Position und Größe speichern

2
app/DD_PM_WINDREAM/frmValidator.vb
View File

@ -428,7 +428,6 @@ Public Class frmValidator
Try Try
DocumentViewerValidator.CloseDocument() DocumentViewerValidator.CloseDocument()
DocumentViewerValidator.Done() DocumentViewerValidator.Done()
Catch ex As Exception Catch ex As Exception
LOGGER.Warn($"Unexpected error in DocumentViewerValidator.Done: {ex.Message}") LOGGER.Warn($"Unexpected error in DocumentViewerValidator.Done: {ex.Message}")
End Try End Try
@ -2378,6 +2377,7 @@ Public Class frmValidator
Private Function GetDocPathWindows(_CheckStandard As Integer) Private Function GetDocPathWindows(_CheckStandard As Integer)
Try Try
Dim oResult As String Dim oResult As String
Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})" Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})"
oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, "GetDocPathWindows1") oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, "GetDocPathWindows1")
LOGGER.Debug($"Checking file 0 [{oResult}] exists?...") LOGGER.Debug($"Checking file 0 [{oResult}] exists?...")