diff --git a/SDL/kunden/usrcntlFiskaluebersicht.vb b/SDL/kunden/usrcntlFiskaluebersicht.vb index e46eaa9f..98bfa2b6 100644 --- a/SDL/kunden/usrcntlFiskaluebersicht.vb +++ b/SDL/kunden/usrcntlFiskaluebersicht.vb @@ -2,6 +2,7 @@ Imports System.Text.RegularExpressions Imports VERAG_PROG_ALLGEMEIN + Public Class usrcntlFiskaluebersicht Public kdNr As Integer = -1 @@ -362,8 +363,33 @@ Public Class usrcntlFiskaluebersicht If BA IsNot Nothing Then If BA.ba_datenarchivId > 0 Then files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(BA.ba_datenarchivId)) End If + + For Each r As DataGridViewRow In dgvUnterlagen.Rows - files.Add(VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("fka_docId").Value)) + + Dim Path = VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(r.Cells("fka_docId").Value) + + Dim extension As String = System.IO.Path.GetExtension(Path).ToLowerInvariant() + + Select Case extension + + Case ".pdf" + + files.Add(Path) + + Case ".png", ".jpg", ".jpeg", ".bmp", ".gif", ".tif", ".tiff" + + Dim PathTemp As String = VERAG_PROG_ALLGEMEIN.cFormularManager.convertPictureToPDF(Path) + + If Not String.IsNullOrEmpty(PathTemp) Then + files.Add(PathTemp) + End If + + End Select + + + + Next VERAG_PROG_ALLGEMEIN.cFormularManager.mergePDFs(files, outputFile) @@ -1065,7 +1091,7 @@ Public Class usrcntlFiskaluebersicht Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "FISKALKUNDENANHAENGE", fk.FK_Datum, "", "", ArtId, kdNr) - If DS.uploadDataToDATENSERVERFileDialog(, ".pdf", , "PDF") Then + If DS.uploadDataToDATENSERVERFileDialog() <> "" Then Dim ANH = New VERAG_PROG_ALLGEMEIN.cFiskalkundenAnhaenge() ANH.fka_Art = ArtId diff --git a/VERAG_PROG_ALLGEMEIN/Classes/cSMS.vb b/VERAG_PROG_ALLGEMEIN/Classes/cSMS.vb index 14884092..81f9d0c9 100644 --- a/VERAG_PROG_ALLGEMEIN/Classes/cSMS.vb +++ b/VERAG_PROG_ALLGEMEIN/Classes/cSMS.vb @@ -482,7 +482,7 @@ Public Class cSMS If Originator.Length > 11 Then Originator = Originator.Substring(0, 11) If Message.Contains(vbLf) Then - Message = Message.Replace(vbLf, " ") + Message = Message.Replace(vbLf, ", ") End If Dim json As New Chilkat.JsonObject diff --git a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb index 2dc61798..0a8d9ecd 100644 --- a/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb +++ b/VERAG_PROG_ALLGEMEIN/DATENSERVER/cDATENSERVER.vb @@ -1274,6 +1274,48 @@ Public Class cFormularManager End If End Sub + Public Shared Function convertPictureToPDF(path As String) As String + + If Not File.Exists(path) Then + Throw New FileNotFoundException("Picture not found.", path) + End If + + Dim outputPath As String = getTMPPath_PDF() + + Dim pdfImage As Spire.Pdf.Graphics.PdfImage = pdfImage.FromFile(path) + + Dim doc As New Spire.Pdf.PdfDocument() + + Try + Dim page As PdfPageBase = doc.Pages.Add() + + Dim pageWidth As Single = page.ActualSize.Width + Dim pageHeight As Single = page.ActualSize.Height + + 'SeitenverhĂ€ltnis beibehalten + Dim scaleX As Single = pageWidth / pdfImage.Width + Dim scaleY As Single = pageHeight / pdfImage.Height + Dim scale As Single = Math.Min(scaleX, scaleY) + + Dim imageWidth As Single = pdfImage.Width * scale + Dim imageHeight As Single = pdfImage.Height * scale + + 'Bild zentrieren + Dim x As Single = (pageWidth - imageWidth) / 2 + Dim y As Single = (pageHeight - imageHeight) / 2 + + page.Canvas.DrawImage(pdfImage, 0, 0) + + doc.SaveToFile(outputPath) + + Finally + doc.Close() + End Try + + + Return outputPath + End Function + @@ -1535,6 +1577,7 @@ Public Class cFormularManager + Public Shared Function getPDFViaSpirePDF_FromURL(URL As String, Optional targetPath As String = "") As String Try If targetPath = "" Then targetPath = getTMPPath_PDF() @@ -2614,7 +2657,7 @@ Public Class DATENVERVER_OPTIONS xmp.SetStructField(pdfaExt, "schemas[1]", pdfaSchema, "namespaceURI", fxNs) xmp.SetStructField(pdfaExt, "schemas[1]", pdfaSchema, "prefix", "fx") - ' đŸ”„ property MUSS rdf:Seq sein! + ' property MUSS rdf:Seq sein! xmp.SetStructField( pdfaExt, "schemas[1]", @@ -2632,7 +2675,7 @@ Public Class DATENVERVER_OPTIONS Dim arrayPath = "schemas[1]/pdfaSchema:property" - ' đŸ”„ Item in rdf:Seq hinzufĂŒgen + ' Item in rdf:Seq hinzufĂŒgen xmp.AppendArrayItem( pdfaExt, arrayPath,