diff --git a/.vs/EDOKAApp/v16/.suo b/.vs/EDOKAApp/v16/.suo index 9d212b6..967d98d 100644 Binary files a/.vs/EDOKAApp/v16/.suo and b/.vs/EDOKAApp/v16/.suo differ diff --git a/BusinessFacade/bin/EDOKALib.BusinessFacade.dll b/BusinessFacade/bin/EDOKALib.BusinessFacade.dll index 955fada..7e6a7a1 100644 Binary files a/BusinessFacade/bin/EDOKALib.BusinessFacade.dll and b/BusinessFacade/bin/EDOKALib.BusinessFacade.dll differ diff --git a/BusinessFacade/bin/EDOKALib.BusinessFacade.pdb b/BusinessFacade/bin/EDOKALib.BusinessFacade.pdb index 30567fc..8654191 100644 Binary files a/BusinessFacade/bin/EDOKALib.BusinessFacade.pdb and b/BusinessFacade/bin/EDOKALib.BusinessFacade.pdb differ diff --git a/BusinessFacade/bin/EDOKALib.Common.dll b/BusinessFacade/bin/EDOKALib.Common.dll index 7f269fa..48ab9c3 100644 Binary files a/BusinessFacade/bin/EDOKALib.Common.dll and b/BusinessFacade/bin/EDOKALib.Common.dll differ diff --git a/BusinessFacade/bin/EDOKALib.Common.pdb b/BusinessFacade/bin/EDOKALib.Common.pdb index b63e196..9a23f4d 100644 Binary files a/BusinessFacade/bin/EDOKALib.Common.pdb and b/BusinessFacade/bin/EDOKALib.Common.pdb differ diff --git a/BusinessFacade/bin/EDOKALib.DataAccess.dll b/BusinessFacade/bin/EDOKALib.DataAccess.dll index c33e9be..872e109 100644 Binary files a/BusinessFacade/bin/EDOKALib.DataAccess.dll and b/BusinessFacade/bin/EDOKALib.DataAccess.dll differ diff --git a/BusinessFacade/bin/EDOKALib.DataAccess.pdb b/BusinessFacade/bin/EDOKALib.DataAccess.pdb index 87b49bc..b8c6c37 100644 Binary files a/BusinessFacade/bin/EDOKALib.DataAccess.pdb and b/BusinessFacade/bin/EDOKALib.DataAccess.pdb differ diff --git a/BusinessFacade/obj/Debug/BusinessFacade.vbprojAssemblyReference.cache b/BusinessFacade/obj/Debug/BusinessFacade.vbprojAssemblyReference.cache index 7a8d69e..6236322 100644 Binary files a/BusinessFacade/obj/Debug/BusinessFacade.vbprojAssemblyReference.cache and b/BusinessFacade/obj/Debug/BusinessFacade.vbprojAssemblyReference.cache differ diff --git a/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.dll b/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.dll index 955fada..7e6a7a1 100644 Binary files a/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.dll and b/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.dll differ diff --git a/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.pdb b/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.pdb index 30567fc..8654191 100644 Binary files a/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.pdb and b/BusinessFacade/obj/Debug/EDOKALib.BusinessFacade.pdb differ diff --git a/Common/bin/EDOKALib.Common.dll b/Common/bin/EDOKALib.Common.dll index 7f269fa..48ab9c3 100644 Binary files a/Common/bin/EDOKALib.Common.dll and b/Common/bin/EDOKALib.Common.dll differ diff --git a/Common/bin/EDOKALib.Common.pdb b/Common/bin/EDOKALib.Common.pdb index b63e196..9a23f4d 100644 Binary files a/Common/bin/EDOKALib.Common.pdb and b/Common/bin/EDOKALib.Common.pdb differ diff --git a/Common/obj/Debug/Common.vbproj.FileListAbsolute.txt b/Common/obj/Debug/Common.vbproj.FileListAbsolute.txt index 86b11f0..09b1ece 100644 --- a/Common/obj/Debug/Common.vbproj.FileListAbsolute.txt +++ b/Common/obj/Debug/Common.vbproj.FileListAbsolute.txt @@ -29,4 +29,3 @@ E:\Software-Projekte\EDOKA\client\Common\obj\Debug\Common.vbproj.CopyComplete E:\Software-Projekte\EDOKA\client\Common\obj\Debug\EDOKALib.Common.dll E:\Software-Projekte\EDOKA\client\Common\obj\Debug\EDOKALib.Common.xml E:\Software-Projekte\EDOKA\client\Common\obj\Debug\EDOKALib.Common.pdb -E:\Software-Projekte\EDOKA\client\Common\obj\Debug\Common.vbprojAssemblyReference.cache diff --git a/Common/obj/Debug/Common.vbprojAssemblyReference.cache b/Common/obj/Debug/Common.vbprojAssemblyReference.cache deleted file mode 100644 index 001c6e0..0000000 Binary files a/Common/obj/Debug/Common.vbprojAssemblyReference.cache and /dev/null differ diff --git a/Common/obj/Debug/EDOKALib.Common.dll b/Common/obj/Debug/EDOKALib.Common.dll index 7f269fa..48ab9c3 100644 Binary files a/Common/obj/Debug/EDOKALib.Common.dll and b/Common/obj/Debug/EDOKALib.Common.dll differ diff --git a/Common/obj/Debug/EDOKALib.Common.pdb b/Common/obj/Debug/EDOKALib.Common.pdb index b63e196..9a23f4d 100644 Binary files a/Common/obj/Debug/EDOKALib.Common.pdb and b/Common/obj/Debug/EDOKALib.Common.pdb differ diff --git a/DataAccess/bin/EDOKALib.Common.dll b/DataAccess/bin/EDOKALib.Common.dll index 7f269fa..48ab9c3 100644 Binary files a/DataAccess/bin/EDOKALib.Common.dll and b/DataAccess/bin/EDOKALib.Common.dll differ diff --git a/DataAccess/bin/EDOKALib.Common.pdb b/DataAccess/bin/EDOKALib.Common.pdb index b63e196..9a23f4d 100644 Binary files a/DataAccess/bin/EDOKALib.Common.pdb and b/DataAccess/bin/EDOKALib.Common.pdb differ diff --git a/DataAccess/bin/EDOKALib.DataAccess.dll b/DataAccess/bin/EDOKALib.DataAccess.dll index c33e9be..872e109 100644 Binary files a/DataAccess/bin/EDOKALib.DataAccess.dll and b/DataAccess/bin/EDOKALib.DataAccess.dll differ diff --git a/DataAccess/bin/EDOKALib.DataAccess.pdb b/DataAccess/bin/EDOKALib.DataAccess.pdb index 87b49bc..b8c6c37 100644 Binary files a/DataAccess/bin/EDOKALib.DataAccess.pdb and b/DataAccess/bin/EDOKALib.DataAccess.pdb differ diff --git a/DataAccess/obj/Debug/DataAccess.vbprojAssemblyReference.cache b/DataAccess/obj/Debug/DataAccess.vbprojAssemblyReference.cache index 08ca990..09e3f2a 100644 Binary files a/DataAccess/obj/Debug/DataAccess.vbprojAssemblyReference.cache and b/DataAccess/obj/Debug/DataAccess.vbprojAssemblyReference.cache differ diff --git a/DataAccess/obj/Debug/EDOKALib.DataAccess.dll b/DataAccess/obj/Debug/EDOKALib.DataAccess.dll index c33e9be..872e109 100644 Binary files a/DataAccess/obj/Debug/EDOKALib.DataAccess.dll and b/DataAccess/obj/Debug/EDOKALib.DataAccess.dll differ diff --git a/DataAccess/obj/Debug/EDOKALib.DataAccess.pdb b/DataAccess/obj/Debug/EDOKALib.DataAccess.pdb index 87b49bc..b8c6c37 100644 Binary files a/DataAccess/obj/Debug/EDOKALib.DataAccess.pdb and b/DataAccess/obj/Debug/EDOKALib.DataAccess.pdb differ diff --git a/EDOKA/EDEX/Serienbriefe/frmtextmarken.vb b/EDOKA/EDEX/Serienbriefe/frmtextmarken.vb index 879c8ae..ee5d35d 100644 --- a/EDOKA/EDEX/Serienbriefe/frmtextmarken.vb +++ b/EDOKA/EDEX/Serienbriefe/frmtextmarken.vb @@ -187,6 +187,15 @@ Public Class frmtextmarken Me.Save_Office() End Sub + Private Sub document_beforeclose(ByVal Doc As Microsoft.Office.Interop.Word.Document, ByRef Cancel As Boolean) Handles objword.DocumentBeforeClose + If Doc.Name = sbdokumentname And Not Schliessen_OK Then + MsgBox("Bitte schliessen Sie das Dokument durch schliessen des Fensters 'Dokumentbefülung bearbeiten'.", vbInformation) + Cancel = True + + End If + + End Sub + #End Region #Region "Load" @@ -246,6 +255,7 @@ Public Class frmtextmarken #End Region #Region "Office" + Dim sbdokumentname As String = "" Public Sub Load_Document(Optional ByVal visible As Boolean = True) 'Rel. Office 2010 Dim dokumentname As String = Globals.Applikationsdaten.Rows(0).Item("pfad_temporaer_dokumente") + Me.serienbriefnr.ToString + "_vorlage.docx" @@ -253,6 +263,7 @@ Public Class frmtextmarken StartWord(True) objword.Documents.Open(dokumentname) objdoc = objword.ActiveDocument + sbdokumentname = objdoc.Name objword.Visible = visible objword.WindowState = Microsoft.Office.Interop.Word.WdWindowState.wdWindowStateMaximize End Sub diff --git a/EDOKA/Utils/Globals.vb b/EDOKA/Utils/Globals.vb index 42a2e06..f589b87 100644 --- a/EDOKA/Utils/Globals.vb +++ b/EDOKA/Utils/Globals.vb @@ -17,7 +17,7 @@ Module Globals Public WithEvents Generic_Event_Handler As New Generic_Event_Handler 'EDOKA-Version Public Version As String = "5.6" - Public Versionsdatum As String = "21.02.2021" + Public Versionsdatum As String = "18.06.2021" Public Force_Exit As Boolean = False 'Datenbankvariablen Public sConnectionString As String diff --git a/EDOKA/bin/20210518_edoka.zip b/EDOKA/bin/20210518_edoka.zip new file mode 100644 index 0000000..52a35d6 Binary files /dev/null and b/EDOKA/bin/20210518_edoka.zip differ diff --git a/EDOKA/bin/EDOKA.exe b/EDOKA/bin/EDOKA.exe index e3657c8..a9828ee 100644 Binary files a/EDOKA/bin/EDOKA.exe and b/EDOKA/bin/EDOKA.exe differ diff --git a/EDOKA/bin/EDOKA.pdb b/EDOKA/bin/EDOKA.pdb index 8842e7a..1930051 100644 Binary files a/EDOKA/bin/EDOKA.pdb and b/EDOKA/bin/EDOKA.pdb differ diff --git a/EDOKA/bin/EDOKALib.Common.dll b/EDOKA/bin/EDOKALib.Common.dll index 7f269fa..48ab9c3 100644 Binary files a/EDOKA/bin/EDOKALib.Common.dll and b/EDOKA/bin/EDOKALib.Common.dll differ diff --git a/EDOKA/bin/EDOKALib.Common.pdb b/EDOKA/bin/EDOKALib.Common.pdb index b63e196..9a23f4d 100644 Binary files a/EDOKA/bin/EDOKALib.Common.pdb and b/EDOKA/bin/EDOKALib.Common.pdb differ diff --git a/EDOKA/bin/EDOKALib.DataAccess.dll b/EDOKA/bin/EDOKALib.DataAccess.dll index c33e9be..872e109 100644 Binary files a/EDOKA/bin/EDOKALib.DataAccess.dll and b/EDOKA/bin/EDOKALib.DataAccess.dll differ diff --git a/EDOKA/bin/EDOKALib.DataAccess.pdb b/EDOKA/bin/EDOKALib.DataAccess.pdb index 87b49bc..b8c6c37 100644 Binary files a/EDOKA/bin/EDOKALib.DataAccess.pdb and b/EDOKA/bin/EDOKALib.DataAccess.pdb differ diff --git a/EDOKA/bin/Microsoft.mshtml.dll b/EDOKA/bin/Microsoft.mshtml.dll index c62119f..8a7dc19 100644 Binary files a/EDOKA/bin/Microsoft.mshtml.dll and b/EDOKA/bin/Microsoft.mshtml.dll differ diff --git a/EDOKA/bin/msdatasrc.dll b/EDOKA/bin/msdatasrc.dll index 5921e89..9d04116 100644 Binary files a/EDOKA/bin/msdatasrc.dll and b/EDOKA/bin/msdatasrc.dll differ diff --git a/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferences.cache index beb5a38..3148ce5 100644 Binary files a/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index ee7fb46..10fcfa3 100644 Binary files a/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/EDOKA/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/EDOKA/obj/Debug/EDOKA.exe b/EDOKA/obj/Debug/EDOKA.exe index e3657c8..a9828ee 100644 Binary files a/EDOKA/obj/Debug/EDOKA.exe and b/EDOKA/obj/Debug/EDOKA.exe differ diff --git a/EDOKA/obj/Debug/EDOKA.pdb b/EDOKA/obj/Debug/EDOKA.pdb index 8842e7a..1930051 100644 Binary files a/EDOKA/obj/Debug/EDOKA.pdb and b/EDOKA/obj/Debug/EDOKA.pdb differ diff --git a/EDOKA/obj/Debug/EDOKAApp.vbproj.CoreCompileInputs.cache b/EDOKA/obj/Debug/EDOKAApp.vbproj.CoreCompileInputs.cache index fb25008..d02ac04 100644 --- a/EDOKA/obj/Debug/EDOKAApp.vbproj.CoreCompileInputs.cache +++ b/EDOKA/obj/Debug/EDOKAApp.vbproj.CoreCompileInputs.cache @@ -1 +1 @@ -d3adf2a1a4591bccec27d61069fbfb144d335bbf +29c8571abf91ec6ecdd735e42df52b191b4b68ce diff --git a/EDOKA/obj/Debug/EDOKAApp.vbproj.ResolveComReference.cache b/EDOKA/obj/Debug/EDOKAApp.vbproj.ResolveComReference.cache index 8e3c0fe..9ec55c0 100644 Binary files a/EDOKA/obj/Debug/EDOKAApp.vbproj.ResolveComReference.cache and b/EDOKA/obj/Debug/EDOKAApp.vbproj.ResolveComReference.cache differ diff --git a/EDOKA/obj/Debug/EDOKAApp.vbprojAssemblyReference.cache b/EDOKA/obj/Debug/EDOKAApp.vbprojAssemblyReference.cache index 056c418..a275fc1 100644 Binary files a/EDOKA/obj/Debug/EDOKAApp.vbprojAssemblyReference.cache and b/EDOKA/obj/Debug/EDOKAApp.vbprojAssemblyReference.cache differ diff --git a/EDOKA/obj/Debug/edoka.exe.licenses b/EDOKA/obj/Debug/edoka.exe.licenses index 6677055..84e9e62 100644 Binary files a/EDOKA/obj/Debug/edoka.exe.licenses and b/EDOKA/obj/Debug/edoka.exe.licenses differ