From 18668bcc6e1eca905411506b809bd9acd99cfcf3 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Mon, 1 Mar 2021 15:01:46 +0100 Subject: [PATCH 1/2] MS --- app/DD_PM_WINDREAM/frmValidator.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index a64e078..9b5f1fd 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -2377,6 +2377,7 @@ Public Class frmValidator Private Function GetDocPathWindows(_CheckStandard As Integer) Try Dim oResult As String + Dim oSQL = $"SELECT dbo.FNPM_GET_FILEPATH ({CURRENT_DOC_GUID},{_CheckStandard})" oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, "GetDocPathWindows1") LOGGER.Debug($"Checking file 0 [{oResult}] exists?...") From 1c9821b0b01002900127ea9b6c1bae8cb59f3208 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Fri, 5 Mar 2021 12:57:01 +0100 Subject: [PATCH 2/2] 2.1.8 MS In-Wor auch bei FormClose Main --- app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 2 +- app/DD_PM_WINDREAM/frmMain.vb | 12 ++++++++++++ app/DD_PM_WINDREAM/frmValidator.vb | 1 - 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index c068f88..813a014 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 9012635..dd1a837 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -85,7 +85,19 @@ Public Class frmMain End Try Return oCHANGED 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 + Free_File() + Try FormOpenClose = True ' Position und Größe speichern diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 9b5f1fd..0b5dd88 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -427,7 +427,6 @@ Public Class frmValidator Try DocumentViewerValidator.CloseDocument() DocumentViewerValidator.Done() - Catch ex As Exception LOGGER.Warn($"Unexpected error in DocumentViewerValidator.Done: {ex.Message}") End Try