Essensbestellungen

SDL/cProgramFunctions.vb

@@ -10,7 +10,6 @@ Imports System.Text.RegularExpressions
 Imports iTextSharp.text.pdf
 Imports SDL.eu.europa.ec
 
-
 Public Class cBerechtignungenFunctions
 
     Public Shared Function loadBerechtigungen(mit_id) As List(Of cBerechtigungen)
@@ -1011,7 +1010,7 @@ Public Class cProgramFunctions
 
     Public Sub screenshot()
         Dim form As New Form
-        form = form.ActiveForm
+        form = Form.ActiveForm
         Dim bounds As Rectangle
         Dim screenshot As System.Drawing.Bitmap
         Dim graph As Graphics
@@ -1124,7 +1123,7 @@ Public Class cProgramFunctions
         Return ""
     End Function
 
-    Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional waehrungsZeichen As String = "€") As String
+    Public Shared Function genExcelFromDT_NEW(dt As DataTable, Optional rangeAsWaehrung() As String = Nothing, Optional ShowAutoFilter As Boolean = True, Optional HeaderTxt As String = "", Optional HeaderTxt2 As String = "", Optional waehrungsZeichen As String = "€", Optional fitCellsToContent As Boolean = False) As String
         Try
 
             Dim sPath As String = Environment.GetFolderPath(Environment.SpecialFolder.Personal) & "\VERAG\SDL\tmp\" ' My.Computer.FileSystem.GetTempFileName
@@ -1160,6 +1159,11 @@ Public Class cProgramFunctions
 
             End If
 
+            If fitCellsToContent Then
+                wb.Worksheets(0).Columns().AdjustToContents()
+                wb.Worksheets(0).Rows().AdjustToContents()
+            End If
+
 
 
             Dim filename As String = sPath & "tmp_" & Now.ToString("ddMMyyyyHHmmss") & ".xlsx"