From 5c1bb5855d405550fef0458bf26c3ade9748efd3 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 18 Oct 2023 16:03:11 +0200 Subject: [PATCH] essensbestellungen --- SDL/frmEssensbestellungen.vb | 3 +++ VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb | 2 ++ VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb | 13 ++++++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/SDL/frmEssensbestellungen.vb b/SDL/frmEssensbestellungen.vb index e3a49f5e..5d93cf9d 100644 --- a/SDL/frmEssensbestellungen.vb +++ b/SDL/frmEssensbestellungen.vb @@ -1,4 +1,5 @@  +Imports com.sun.org.apache.xpath.internal.functions Imports VERAG_PROG_ALLGEMEIN Public Class frmEssensbestellungen @@ -153,6 +154,8 @@ Public Class frmEssensbestellungen essen.eb_datum = CDate(dt.Rows(0).Item("MenuDateVon")) essen.eb_gebaeude = cbxGebauede._value essen.eb_anmerkung = txtAnmerkung.Text + essen.eb_firma = cAllgemein.MITARBEITER.getFirma + essen.SAVE() loadDGVBestellungen() diff --git a/VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb b/VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb index 8f22e2dd..b4146468 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/Essensbestellung.vb @@ -23,6 +23,7 @@ Public Class cEssensbestellung Property eb_anmerkung As Object = Nothing Property eb_gesendet_am As Object = Nothing Property eb_gesendet As Boolean + Property eb_firma As Object = Nothing Public hasEntry = False @@ -72,6 +73,7 @@ Public Class cEssensbestellung list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_anmerkung", eb_anmerkung)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_gesendet", eb_gesendet)) list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_gesendet_am", eb_gesendet_am)) + list.Add(New VERAG_PROG_ALLGEMEIN.SQLVariable("eb_firma", eb_firma)) Return list diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 3fb50dd0..f642b6c8 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -12,7 +12,7 @@ Imports Spire.Pdf.HtmlConverter Imports System.Threading Imports System.Net Imports Spire.Pdf.Tables - +Imports System.Windows.Forms.VisualStyles Public Class cDATENSERVER @@ -1374,9 +1374,16 @@ Public Class cFormularManager - Public Shared Function getPDFViaSpirePDF_FromURLStream(URL As String, Optional targetPath As String = "", Optional openFileAfterDownload As Boolean = True) As String + Public Shared Function getPDFViaSpirePDF_FromURLStream(URL As String, Optional filename As String = "", Optional targetPath As String = "", Optional openFileAfterDownload As Boolean = True) As String Try - If targetPath = "" Then targetPath = getTMPPath_PDF() + If targetPath = "" Then + If filename <> "" Then + targetPath = System.IO.Path.GetTempPath() & filename & ".pdf" + Else + targetPath = getTMPPath_PDF() + End If + End If + VERAG_PROG_ALLGEMEIN.cProgramFunctions.spireLoadLicense()