diff --git a/Aviso/frmEssensbestellungenAdministration.vb b/Aviso/frmEssensbestellungenAdministration.vb index 0e7b414..4e1a7fd 100644 --- a/Aviso/frmEssensbestellungenAdministration.vb +++ b/Aviso/frmEssensbestellungenAdministration.vb @@ -572,19 +572,19 @@ Public Class frmEssensbestellungenAdministration Case "Excel" - SDL.cProgramFunctions.genExcelFromDT_NEW(generateDTBestellungen()) + SDL.cProgramFunctions.genExcelFromDT_NEW(generateDTBestellungen(True)) End Select End Sub - Private Function generateDTBestellungen() As DataTable + Private Function generateDTBestellungen(Optional exportToExcel As Boolean = False) As DataTable Dim dtBestellungen As DataTable - Dim SQLStringBEstellungen As String = "SELECT [eb_mitname] as Name ,[eb_mitid] as ID , [eb_kw] as KW , [eb_gebaeude] as Gebaeude ,[eb_abteilung] as Abteilung ,[eb_montag] As Montag ,[eb_dienstag] As Dienstag,[eb_mittwoch] As Mittwoch, + Dim SQLStringBEstellungen As String = "SELECT [eb_mitname] as Name ,[eb_mitid] as ID , LEFT([eb_kw],5) as KW , [eb_gebaeude] as Gebaeude ,[eb_abteilung] as Abteilung ,[eb_montag] As Montag ,[eb_dienstag] As Dienstag,[eb_mittwoch] As Mittwoch, [eb_donnerstag] As Donnerstag ,[eb_freitag] as Freitag, [eb_anmerkung] as Anmerkung ,[eb_datum] as Datum , [eb_storniert] as Storniert FROM [tblEssensbestellungen] WHERE eb_kw = '" & cbxMailKW._value & "' AND eb_gebaeude = '" & cbxMailGebäude._value & "' AND ISNULL(eb_storniert,1)=0 Order by eb_datum" @@ -646,22 +646,22 @@ Public Class frmEssensbestellungenAdministration For Each el In uniqueMenusMontag - resultMontag &= IIf(el.Key.Montag <> "", String.Format("{1}x {0}, ", el.Key.Montag, el.Count()), "") + resultMontag &= IIf(el.Key.Montag <> "", String.Format("{1}x {0}, " & vbNewLine, el.Key.Montag, el.Count()), "") Next For Each el In uniqueMenusDienstag - resultDienstag &= IIf(el.Key.Dienstag <> "", String.Format("{1}x {0}, ", el.Key.Dienstag, el.Count()), "") + resultDienstag &= IIf(el.Key.Dienstag <> "", String.Format("{1}x {0}, " & vbNewLine, el.Key.Dienstag, el.Count()), "") Next For Each el In uniqueMenusMittwoch - resultMittwoch &= IIf(el.Key.Mittwoch <> "", String.Format("{1}x {0}, ", el.Key.Mittwoch, el.Count()), "") + resultMittwoch &= IIf(el.Key.Mittwoch <> "", String.Format("{1}x {0}, " & vbNewLine, el.Key.Mittwoch, el.Count()), "") Next For Each el In uniqueMenusDonnerstag - resultDonnerstag &= IIf(el.Key.Donnerstag <> "", String.Format("{1}x {0}, ", el.Key.Donnerstag, el.Count()), "") + resultDonnerstag &= IIf(el.Key.Donnerstag <> "", String.Format("{1}x {0}, " & vbNewLine, el.Key.Donnerstag, el.Count()), "") Next For Each el In uniqueMenusFreitag - resultFreitag &= IIf(el.Key.Freitag <> "", String.Format("{1}x {0}, ", el.Key.Freitag, el.Count()), "") + resultFreitag &= IIf(el.Key.Freitag <> "", String.Format("{1}x {0}, " & vbNewLine, el.Key.Freitag, el.Count()), "") Next @@ -683,6 +683,14 @@ Public Class frmEssensbestellungenAdministration dtBestellungen.Rows.Add(R) ' MessageBox.Show(String.Join(Environment.NewLine, result)) + If exportToExcel Then + dtBestellungen.Columns.Remove("ID") + dtBestellungen.Columns.Remove("Datum") + dtBestellungen.Columns.Remove("Storniert") + dtBestellungen.Columns.Remove("Gebaeude") + dtBestellungen.Columns.Remove("Abteilung") + End If + Return dtBestellungen