Essensbestellungen

2023-01-09 16:23:32 +01:00
parent aae58351a7
commit ebafee916f
8 changed files with 459 additions and 89 deletions
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("3.8.4.5")>
-<Assembly: AssemblyFileVersion("3.8.4.5")>
+<Assembly: AssemblyVersion("3.8.4.6")>
+<Assembly: AssemblyFileVersion("3.8.4.6")>
--- a/Aviso/UsrCntlEssensbestellungen.Designer.vb
+++ b/Aviso/UsrCntlEssensbestellungen.Designer.vb
@@ -68,6 +68,8 @@ Partial Class UsrCntlessensbestellungen
        Me.txtGebäude = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.Label1 = New System.Windows.Forms.Label()
        Me.CheckBox3 = New System.Windows.Forms.CheckBox()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.txtAnmerkung = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.MyPanel1.SuspendLayout()
        Me.GroupBoxDienstag.SuspendLayout()
        Me.GroupBoxMontag.SuspendLayout()
@@ -603,18 +605,18 @@ Partial Class UsrCntlessensbestellungen
        Me.txtGebäude._Waehrung = False
        Me.txtGebäude._WaehrungZeichen = True
        Me.txtGebäude.ForeColor = System.Drawing.Color.Black
-        Me.txtGebäude.Location = New System.Drawing.Point(541, 9)
+        Me.txtGebäude.Location = New System.Drawing.Point(514, -3)
        Me.txtGebäude.MaxLineLength = -1
        Me.txtGebäude.MaxLines_Warning = ""
        Me.txtGebäude.MaxLines_Warning_Label = Nothing
        Me.txtGebäude.Name = "txtGebäude"
-        Me.txtGebäude.Size = New System.Drawing.Size(120, 20)
+        Me.txtGebäude.Size = New System.Drawing.Size(142, 20)
        Me.txtGebäude.TabIndex = 30
        '
        'Label1
        '
        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(481, 12)
+        Me.Label1.Location = New System.Drawing.Point(444, 0)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(54, 13)
        Me.Label1.TabIndex = 30
@@ -630,10 +632,44 @@ Partial Class UsrCntlessensbestellungen
        Me.CheckBox3.Text = "gesendet"
        Me.CheckBox3.UseVisualStyleBackColor = True
        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(444, 17)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(64, 13)
+        Me.Label3.TabIndex = 32
+        Me.Label3.Text = "Anmerkung:"
+        '
+        'txtAnmerkung
+        '
+        Me.txtAnmerkung._DateTimeOnly = False
+        Me.txtAnmerkung._numbersOnly = False
+        Me.txtAnmerkung._numbersOnlyKommastellen = ""
+        Me.txtAnmerkung._numbersOnlyTrennzeichen = True
+        Me.txtAnmerkung._Prozent = False
+        Me.txtAnmerkung._ShortDateNew = False
+        Me.txtAnmerkung._ShortDateOnly = False
+        Me.txtAnmerkung._TimeOnly = False
+        Me.txtAnmerkung._TimeOnly_Seconds = False
+        Me.txtAnmerkung._value = ""
+        Me.txtAnmerkung._Waehrung = False
+        Me.txtAnmerkung._WaehrungZeichen = True
+        Me.txtAnmerkung.ForeColor = System.Drawing.Color.Black
+        Me.txtAnmerkung.Location = New System.Drawing.Point(514, 14)
+        Me.txtAnmerkung.MaxLineLength = -1
+        Me.txtAnmerkung.MaxLines_Warning = ""
+        Me.txtAnmerkung.MaxLines_Warning_Label = Nothing
+        Me.txtAnmerkung.Name = "txtAnmerkung"
+        Me.txtAnmerkung.Size = New System.Drawing.Size(142, 20)
+        Me.txtAnmerkung.TabIndex = 33
+        '
        'UsrCntlessensbestellungen
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.txtAnmerkung)
        Me.Controls.Add(Me.CheckBox3)
        Me.Controls.Add(Me.Label1)
        Me.Controls.Add(Me.txtGebäude)
@@ -642,7 +678,7 @@ Partial Class UsrCntlessensbestellungen
        Me.Controls.Add(Me.CheckBox1)
        Me.Controls.Add(Me.MyPanel1)
        Me.Name = "UsrCntlessensbestellungen"
-        Me.Size = New System.Drawing.Size(690, 348)
+        Me.Size = New System.Drawing.Size(690, 358)
        Me.MyPanel1.ResumeLayout(False)
        Me.MyPanel1.PerformLayout()
        Me.GroupBoxDienstag.ResumeLayout(False)
@@ -705,4 +741,6 @@ Partial Class UsrCntlessensbestellungen
    Friend WithEvents txtGebäude As VERAG_PROG_ALLGEMEIN.MyTextBox
    Friend WithEvents Label1 As Label
    Friend WithEvents CheckBox3 As CheckBox
+    Friend WithEvents Label3 As Label
+    Friend WithEvents txtAnmerkung As VERAG_PROG_ALLGEMEIN.MyTextBox
 End Class
--- a/Aviso/UsrCntlEssensbestellungen.vb
+++ b/Aviso/UsrCntlEssensbestellungen.vb
@@ -33,10 +33,12 @@ Public Class UsrCntlessensbestellungen
        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
        Me.CheckBox1.Checked = storniert
        Me.CheckBox2.Checked = abgerechnet
-        dt = SQL.loadDgvBySql("SELECT Top 1 * FROM tblEBMenu where [MenuTitel] = '" & menu & "' order by MenuDateVon desc", "AVISO", 100, True)
+        'dt = SQL.loadDgvBySql("SELECT Top 1 * FROM tblEBMenu where [MenuTitel] = '" & menu & "' order by MenuDateVon desc", "AVISO", 100, True)
+        dt = SQL.loadDgvBySql("Select Case Top 1 * from (Select (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' +  Convert(varchar, Year(MenuDateVon)) as kwDate, * FROM tblEBMenu) kwDate where kwDate = '" & menu & "'", "AVISO", 100, True)
        loadMenuInfo(dt)
        essen = New cEssensbestellung()
        txtGebäude.Text = essen.eb_gebaeude.ToString
+        txtAnmerkung.Text = essen.eb_anmerkung.ToString

    End Sub

@@ -52,9 +54,11 @@ Public Class UsrCntlessensbestellungen
        Dim menutitle = bestellung.eb_kw.ToString()
        Me.CheckBox1.Checked = essen.eb_storniert
        Me.CheckBox2.Checked = essen.eb_abgerechnet
-        dt = SQL.loadDgvBySql("SELECT Top 1 * FROM tblEBMenu where [MenuTitel] = '" & menutitle & "' order by MenuDateVon desc", "AVISO", 100, True)
+        'dt = SQL.loadDgvBySql("SELECT Top 1 * FROM tblEBMenu where [MenuTitel] = '" & menutitle & "' order by MenuDateVon desc", "AVISO", 100, True)
+        dt = SQL.loadDgvBySql("Select Case Top 1 * from (Select (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' +  Convert(varchar, Year(MenuDateVon)) as kwDate, * FROM tblEBMenu) kwDate where kwDate = '" & menutitle & "'", "AVISO", 100, True)
        loadMenuInfo(dt)
        txtGebäude.Text = essen.eb_gebaeude.ToString
+        txtAnmerkung.Text = essen.eb_anmerkung.ToString

    End Sub

@@ -212,9 +216,11 @@ Public Class UsrCntlessensbestellungen
        If CheckBox1.Checked Or CheckBox2.Checked Or CheckBox3.Checked Then
            MyPanel1.Enabled = False
            txtGebäude.Enabled = False
+            txtAnmerkung.Enabled = False
        Else
            MyPanel1.Enabled = True
            txtGebäude.Enabled = True
+            txtAnmerkung.Enabled = True

        End If
    End Sub
--- a/Aviso/frmEssensbestellungen.Designer.vb
+++ b/Aviso/frmEssensbestellungen.Designer.vb
@@ -95,6 +95,8 @@ Partial Class frmEssensbestellungen
        Me.lblTest = New System.Windows.Forms.Label()
        Me.pnlTop = New System.Windows.Forms.Panel()
        Me.Label4 = New System.Windows.Forms.Label()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.txtAnmerkung = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.MyPanel1.SuspendLayout()
        Me.GroupBoxDienstag.SuspendLayout()
        CType(Me.pb_dienstag, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -123,7 +125,7 @@ Partial Class frmEssensbestellungen
        'btnSave
        '
        Me.btnSave.Anchor = System.Windows.Forms.AnchorStyles.Bottom
-        Me.btnSave.Location = New System.Drawing.Point(319, 599)
+        Me.btnSave.Location = New System.Drawing.Point(319, 644)
        Me.btnSave.Name = "btnSave"
        Me.btnSave.Size = New System.Drawing.Size(75, 23)
        Me.btnSave.TabIndex = 10
@@ -158,7 +160,7 @@ Partial Class frmEssensbestellungen
        'lblAbteilung
        '
        Me.lblAbteilung.AutoSize = True
-        Me.lblAbteilung.Location = New System.Drawing.Point(511, 74)
+        Me.lblAbteilung.Location = New System.Drawing.Point(507, 74)
        Me.lblAbteilung.Name = "lblAbteilung"
        Me.lblAbteilung.Size = New System.Drawing.Size(54, 13)
        Me.lblAbteilung.TabIndex = 18
@@ -167,7 +169,7 @@ Partial Class frmEssensbestellungen
        'lblGebaeude
        '
        Me.lblGebaeude.AutoSize = True
-        Me.lblGebaeude.Location = New System.Drawing.Point(511, 92)
+        Me.lblGebaeude.Location = New System.Drawing.Point(507, 92)
        Me.lblGebaeude.Name = "lblGebaeude"
        Me.lblGebaeude.Size = New System.Drawing.Size(54, 13)
        Me.lblGebaeude.TabIndex = 19
@@ -198,7 +200,7 @@ Partial Class frmEssensbestellungen
        Me.cbxGebauede._value = ""
        Me.cbxGebauede.DropDownWidth = 150
        Me.cbxGebauede.FormattingEnabled = True
-        Me.cbxGebauede.Location = New System.Drawing.Point(584, 89)
+        Me.cbxGebauede.Location = New System.Drawing.Point(580, 89)
        Me.cbxGebauede.Name = "cbxGebauede"
        Me.cbxGebauede.Size = New System.Drawing.Size(95, 21)
        Me.cbxGebauede.TabIndex = 21
@@ -218,7 +220,7 @@ Partial Class frmEssensbestellungen
        Me.MyPanel1.Controls.Add(Me.Mittwoch)
        Me.MyPanel1.Controls.Add(Me.GroupBoxDonnerstag)
        Me.MyPanel1.Controls.Add(Me.txtAnzahlMenu)
-        Me.MyPanel1.Location = New System.Drawing.Point(12, 116)
+        Me.MyPanel1.Location = New System.Drawing.Point(12, 130)
        Me.MyPanel1.Name = "MyPanel1"
        Me.MyPanel1.Size = New System.Drawing.Size(667, 266)
        Me.MyPanel1.TabIndex = 18
@@ -782,7 +784,7 @@ Partial Class frmEssensbestellungen
        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
        Me.dgvBestellungen.DefaultCellStyle = DataGridViewCellStyle2
-        Me.dgvBestellungen.Location = New System.Drawing.Point(19, 418)
+        Me.dgvBestellungen.Location = New System.Drawing.Point(19, 463)
        Me.dgvBestellungen.Name = "dgvBestellungen"
        Me.dgvBestellungen.ReadOnly = True
        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
@@ -813,7 +815,7 @@ Partial Class frmEssensbestellungen
        'txtAbteilung
        '
        Me.txtAbteilung.AutoSize = True
-        Me.txtAbteilung.Location = New System.Drawing.Point(581, 74)
+        Me.txtAbteilung.Location = New System.Drawing.Point(577, 74)
        Me.txtAbteilung.Name = "txtAbteilung"
        Me.txtAbteilung.Size = New System.Drawing.Size(29, 13)
        Me.txtAbteilung.TabIndex = 23
@@ -821,7 +823,7 @@ Partial Class frmEssensbestellungen
        '
        'Button2
        '
-        Me.Button2.Location = New System.Drawing.Point(499, 385)
+        Me.Button2.Location = New System.Drawing.Point(499, 399)
        Me.Button2.Name = "Button2"
        Me.Button2.Size = New System.Drawing.Size(180, 21)
        Me.Button2.TabIndex = 25
@@ -839,7 +841,7 @@ Partial Class frmEssensbestellungen
        'Label3
        '
        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(511, 55)
+        Me.Label3.Location = New System.Drawing.Point(507, 55)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(59, 13)
        Me.Label3.TabIndex = 26
@@ -848,7 +850,7 @@ Partial Class frmEssensbestellungen
        'PictureBox1
        '
        Me.PictureBox1.Image = Global.AVISO.My.Resources.Resources.documents
-        Me.PictureBox1.Location = New System.Drawing.Point(446, 73)
+        Me.PictureBox1.Location = New System.Drawing.Point(442, 73)
        Me.PictureBox1.Name = "PictureBox1"
        Me.PictureBox1.Size = New System.Drawing.Size(42, 37)
        Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
@@ -858,7 +860,7 @@ Partial Class frmEssensbestellungen
        'Label1
        '
        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(450, 57)
+        Me.Label1.Location = New System.Drawing.Point(446, 57)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(34, 13)
        Me.Label1.TabIndex = 28
@@ -894,11 +896,45 @@ Partial Class frmEssensbestellungen
        Me.Label4.TabIndex = 0
        Me.Label4.Text = "Essensbestellung"
        '
+        'Label5
+        '
+        Me.Label5.AutoSize = True
+        Me.Label5.Location = New System.Drawing.Point(443, 114)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(64, 13)
+        Me.Label5.TabIndex = 31
+        Me.Label5.Text = "Anmerkung:"
+        '
+        'txtAnmerkung
+        '
+        Me.txtAnmerkung._DateTimeOnly = False
+        Me.txtAnmerkung._numbersOnly = False
+        Me.txtAnmerkung._numbersOnlyKommastellen = ""
+        Me.txtAnmerkung._numbersOnlyTrennzeichen = True
+        Me.txtAnmerkung._Prozent = False
+        Me.txtAnmerkung._ShortDateNew = False
+        Me.txtAnmerkung._ShortDateOnly = False
+        Me.txtAnmerkung._TimeOnly = False
+        Me.txtAnmerkung._TimeOnly_Seconds = False
+        Me.txtAnmerkung._value = ""
+        Me.txtAnmerkung._Waehrung = False
+        Me.txtAnmerkung._WaehrungZeichen = True
+        Me.txtAnmerkung.ForeColor = System.Drawing.Color.Black
+        Me.txtAnmerkung.Location = New System.Drawing.Point(510, 111)
+        Me.txtAnmerkung.MaxLineLength = -1
+        Me.txtAnmerkung.MaxLines_Warning = ""
+        Me.txtAnmerkung.MaxLines_Warning_Label = Nothing
+        Me.txtAnmerkung.Name = "txtAnmerkung"
+        Me.txtAnmerkung.Size = New System.Drawing.Size(169, 20)
+        Me.txtAnmerkung.TabIndex = 33
+        '
        'frmEssensbestellungen
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(712, 632)
+        Me.ClientSize = New System.Drawing.Size(712, 677)
+        Me.Controls.Add(Me.txtAnmerkung)
+        Me.Controls.Add(Me.Label5)
        Me.Controls.Add(Me.pnlTop)
        Me.Controls.Add(Me.lblTest)
        Me.Controls.Add(Me.Label1)
@@ -1016,4 +1052,6 @@ Partial Class frmEssensbestellungen
    Friend WithEvents pnlTop As Panel
    Friend WithEvents Label4 As Label
    Friend WithEvents lblWarning As Label
+    Friend WithEvents Label5 As Label
+    Friend WithEvents txtAnmerkung As VERAG_PROG_ALLGEMEIN.MyTextBox
 End Class
--- a/Aviso/frmEssensbestellungen.vb
+++ b/Aviso/frmEssensbestellungen.vb
@@ -18,7 +18,7 @@ Public Class frmEssensbestellungen



-        cbxMenu.fillWithSQL("SELECT Distinct Top 10 (MenuTitel), MenuDateVon from tblEBMenu order by MenuDateVon desc", True, "AVISO", True) '/ where MenuDateVon >= GETDATE() 
+        cbxMenu.fillWithSQL("SELECT Distinct Top 10 (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' +  Convert(varchar, Year(MenuDateVon)), MenuDateVon from tblEBMenu order by MenuDateVon desc", True, "AVISO", True) '/ where MenuDateVon >= GETDATE() 

        txtMA.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
        txtAbteilung.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG
@@ -41,7 +41,7 @@ Public Class frmEssensbestellungen
            Exit Sub
        End If

-        essen = New cEssensbestellung(cbxMenu._value, cAllgemein.USRID, cbxGebauede._value, cAllgemein.ABTEILUNG, cAllgemein.MITARBEITER.mit_vname & " " & cAllgemein.MITARBEITER.mit_nname)
+        essen = New cEssensbestellung(cbxMenu._value, cAllgemein.USRID, cbxGebauede._value, cAllgemein.ABTEILUNG, cAllgemein.MITARBEITER.mit_vname & " " & cAllgemein.MITARBEITER.mit_nname, txtAnmerkung)

        If cb_montag.Checked Then
            If rbMenu_montag.Checked Then
@@ -141,6 +141,7 @@ Public Class frmEssensbestellungen

        essen.eb_datum = CDate(dt.Rows(0).Item("MenuDateVon"))
        essen.eb_gebaeude = cbxGebauede._value
+        essen.eb_anmerkung = txtAnmerkung.Text
        essen.SAVE()
        loadDGVBestellungen()

@@ -169,7 +170,7 @@ Public Class frmEssensbestellungen
        btnSave.Enabled = True
        'Button1.Visible = True
        dt.Clear()
-        dt = SQL.loadDgvBySql("SELECT Top 1 * FROM tblEBMenu where [MenuTitel] = '" & cbxMenu._value & "' order by MenuDateVon desc", "AVISO", 100, True)
+        dt = SQL.loadDgvBySql("SELECT Top 1 * from (SELECT (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' +  Convert(varchar, Year(MenuDateVon)) as kwDate, * FROM tblEBMenu) kwDate where kwDate = '" & cbxMenu._value & "'", "AVISO", 100, True)

        If dt.Rows.Count > 0 Then
            If checkIfOrderIsPossible() Then
@@ -296,7 +297,7 @@ Public Class frmEssensbestellungen
        Dim SQLWhere As String = ""
        If cbxMenu._value IsNot "" Then SQLWhere = " AND [eb_kw] = '" & cbxMenu._value.ToString & "'"

-        Dim SQLString As String = "SELECT [eb_kw], [eb_mitid] , [eb_gebaeude],[eb_abteilung],[eb_montag],[eb_dienstag],[eb_mittwoch],[eb_donnerstag] ,[eb_freitag],[eb_preis], [eb_mitname], [eb_datum]  FROM [tblEssensbestellungen] where [eb_mitid] = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'" & SQLWhere & " order by [eb_kw]"
+        Dim SQLString As String = "SELECT [eb_kw], [eb_mitid] , [eb_gebaeude],[eb_abteilung],[eb_montag],[eb_dienstag],[eb_mittwoch],[eb_donnerstag] ,[eb_freitag],[eb_preis], [eb_mitname], [eb_datum], [eb_anmerkung]  FROM [tblEssensbestellungen] where [eb_mitid] = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRID & "'" & SQLWhere & " order by [eb_kw]"

        dgvBestellungen.SET_SQL(SQLString, "AVISO", ,)
        dgvBestellungen.LOAD()
@@ -328,6 +329,8 @@ Public Class frmEssensbestellungen
            .Columns("eb_preis").HeaderText = "Preis"
            .Columns("eb_preis").Width = 40
            .Columns("eb_preis").DefaultCellStyle.Format = "N"
+            .Columns("eb_anmerkung").HeaderText = "Anm"
+            .Columns("eb_anmerkung").Width = 80
        End With

    End Sub
@@ -439,7 +442,7 @@ Public Class frmEssensbestellungen

        If dgvBestellungen.Rows.Count = 0 Then Exit Sub

-        Dim currentEssen As New cEssensbestellung(dgvBestellungen.CurrentRow.Cells("eb_kw").Value, dgvBestellungen.CurrentRow.Cells("eb_mitid").Value, dgvBestellungen.CurrentRow.Cells("eb_gebaeude").Value, dgvBestellungen.CurrentRow.Cells("eb_abteilung").Value, dgvBestellungen.CurrentRow.Cells("eb_mitname").Value)
+        Dim currentEssen As New cEssensbestellung(dgvBestellungen.CurrentRow.Cells("eb_kw").Value, dgvBestellungen.CurrentRow.Cells("eb_mitid").Value, dgvBestellungen.CurrentRow.Cells("eb_gebaeude").Value, dgvBestellungen.CurrentRow.Cells("eb_abteilung").Value, dgvBestellungen.CurrentRow.Cells("eb_mitname").Value, dgvBestellungen.CurrentRow.Cells("eb_anmerkung").Value)

        cbxMenu.changeItem(currentEssen.eb_kw)

@@ -507,6 +510,7 @@ Public Class frmEssensbestellungen


        cbxGebauede.Text = currentEssen.eb_gebaeude
+        txtAnmerkung.Text = currentEssen.eb_anmerkung


    End Sub
--- a/Aviso/frmEssensbestellungenAdministration.Designer.vb
+++ b/Aviso/frmEssensbestellungenAdministration.Designer.vb
@@ -63,6 +63,13 @@ Partial Class frmEssensbestellungenAdministration
        Me.Label5 = New System.Windows.Forms.Label()
        Me.txtSumme = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.dgvBestellungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
+        Me.cbxMailKW = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label7 = New System.Windows.Forms.Label()
+        Me.cbxMailGebäude = New VERAG_PROG_ALLGEMEIN.MyComboBox()
+        Me.Label8 = New System.Windows.Forms.Label()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.lblWarning = New System.Windows.Forms.Label()
+        Me.Button2 = New System.Windows.Forms.Button()
        Me.pnlTop.SuspendLayout()
        Me.Panel1.SuspendLayout()
        Me.ContextMenuStrip1.SuspendLayout()
@@ -139,7 +146,7 @@ Partial Class frmEssensbestellungenAdministration
        Me.cbKW._allowedValuesFreiText = Nothing
        Me.cbKW._allowFreiText = False
        Me.cbKW._value = ""
-        Me.cbKW.DropDownWidth = 250
+        Me.cbKW.DropDownWidth = 100
        Me.cbKW.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cbKW.FormattingEnabled = True
        Me.cbKW.Location = New System.Drawing.Point(311, 29)
@@ -487,35 +494,35 @@ Partial Class frmEssensbestellungenAdministration
        '
        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StornierenToolStripMenuItem, Me.AbgerechnetToolStripMenuItem, Me.BearbeitenToolStripMenuItem, Me.AnHigway118SchickenToolStripMenuItem})
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        Me.ContextMenuStrip1.Size = New System.Drawing.Size(203, 92)
+        Me.ContextMenuStrip1.Size = New System.Drawing.Size(283, 92)
        '
        'StornierenToolStripMenuItem
        '
        Me.StornierenToolStripMenuItem.Name = "StornierenToolStripMenuItem"
-        Me.StornierenToolStripMenuItem.Size = New System.Drawing.Size(202, 22)
+        Me.StornierenToolStripMenuItem.Size = New System.Drawing.Size(282, 22)
        Me.StornierenToolStripMenuItem.Text = "stornieren"
        '
        'AbgerechnetToolStripMenuItem
        '
        Me.AbgerechnetToolStripMenuItem.Name = "AbgerechnetToolStripMenuItem"
-        Me.AbgerechnetToolStripMenuItem.Size = New System.Drawing.Size(202, 22)
+        Me.AbgerechnetToolStripMenuItem.Size = New System.Drawing.Size(282, 22)
        Me.AbgerechnetToolStripMenuItem.Text = "abgerechnet"
        '
        'BearbeitenToolStripMenuItem
        '
        Me.BearbeitenToolStripMenuItem.Name = "BearbeitenToolStripMenuItem"
-        Me.BearbeitenToolStripMenuItem.Size = New System.Drawing.Size(202, 22)
+        Me.BearbeitenToolStripMenuItem.Size = New System.Drawing.Size(282, 22)
        Me.BearbeitenToolStripMenuItem.Text = "bearbeiten"
        '
        'AnHigway118SchickenToolStripMenuItem
        '
        Me.AnHigway118SchickenToolStripMenuItem.Name = "AnHigway118SchickenToolStripMenuItem"
-        Me.AnHigway118SchickenToolStripMenuItem.Size = New System.Drawing.Size(202, 22)
-        Me.AnHigway118SchickenToolStripMenuItem.Text = "An Higway 118 schicken"
+        Me.AnHigway118SchickenToolStripMenuItem.Size = New System.Drawing.Size(282, 22)
+        Me.AnHigway118SchickenToolStripMenuItem.Text = "markierte Bestellungen per Mail senden"
        '
        'txtAnzahlDS
        '
-        Me.txtAnzahlDS.Location = New System.Drawing.Point(1170, 744)
+        Me.txtAnzahlDS.Location = New System.Drawing.Point(1170, 741)
        Me.txtAnzahlDS.Name = "txtAnzahlDS"
        Me.txtAnzahlDS.ReadOnly = True
        Me.txtAnzahlDS.Size = New System.Drawing.Size(60, 20)
@@ -525,7 +532,7 @@ Partial Class frmEssensbestellungenAdministration
        '
        Me.Label27.AutoSize = True
        Me.Label27.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label27.Location = New System.Drawing.Point(860, 747)
+        Me.Label27.Location = New System.Drawing.Point(860, 744)
        Me.Label27.Name = "Label27"
        Me.Label27.Size = New System.Drawing.Size(45, 13)
        Me.Label27.TabIndex = 46
@@ -535,7 +542,7 @@ Partial Class frmEssensbestellungenAdministration
        '
        Me.Label5.AutoSize = True
        Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label5.Location = New System.Drawing.Point(1065, 748)
+        Me.Label5.Location = New System.Drawing.Point(1065, 745)
        Me.Label5.Name = "Label5"
        Me.Label5.Size = New System.Drawing.Size(99, 13)
        Me.Label5.TabIndex = 44
@@ -556,7 +563,7 @@ Partial Class frmEssensbestellungenAdministration
        Me.txtSumme._Waehrung = True
        Me.txtSumme._WaehrungZeichen = True
        Me.txtSumme.ForeColor = System.Drawing.Color.Black
-        Me.txtSumme.Location = New System.Drawing.Point(931, 744)
+        Me.txtSumme.Location = New System.Drawing.Point(931, 741)
        Me.txtSumme.MaxLineLength = -1
        Me.txtSumme.MaxLines_Warning = ""
        Me.txtSumme.MaxLines_Warning_Label = Nothing
@@ -574,15 +581,103 @@ Partial Class frmEssensbestellungenAdministration
        Me.dgvBestellungen.ContextMenuStrip = Me.ContextMenuStrip1
        Me.dgvBestellungen.Location = New System.Drawing.Point(0, 140)
        Me.dgvBestellungen.Name = "dgvBestellungen"
-        Me.dgvBestellungen.Size = New System.Drawing.Size(1242, 598)
+        Me.dgvBestellungen.Size = New System.Drawing.Size(1242, 581)
        Me.dgvBestellungen.TabIndex = 43
        '
+        'cbxMailKW
+        '
+        Me.cbxMailKW._allowedValuesFreiText = Nothing
+        Me.cbxMailKW._allowFreiText = False
+        Me.cbxMailKW._value = ""
+        Me.cbxMailKW.DropDownWidth = 100
+        Me.cbxMailKW.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxMailKW.FormattingEnabled = True
+        Me.cbxMailKW.Location = New System.Drawing.Point(14, 741)
+        Me.cbxMailKW.Name = "cbxMailKW"
+        Me.cbxMailKW.Size = New System.Drawing.Size(91, 22)
+        Me.cbxMailKW.TabIndex = 57
+        '
+        'Label7
+        '
+        Me.Label7.AutoSize = True
+        Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label7.Location = New System.Drawing.Point(11, 724)
+        Me.Label7.Name = "Label7"
+        Me.Label7.Size = New System.Drawing.Size(94, 13)
+        Me.Label7.TabIndex = 56
+        Me.Label7.Text = "Kalenderwoche"
+        '
+        'cbxMailGebäude
+        '
+        Me.cbxMailGebäude._allowedValuesFreiText = Nothing
+        Me.cbxMailGebäude._allowFreiText = True
+        Me.cbxMailGebäude._value = ""
+        Me.cbxMailGebäude.DropDownWidth = 250
+        Me.cbxMailGebäude.Font = New System.Drawing.Font("Microsoft Tai Le", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cbxMailGebäude.FormattingEnabled = True
+        Me.cbxMailGebäude.Location = New System.Drawing.Point(122, 741)
+        Me.cbxMailGebäude.Name = "cbxMailGebäude"
+        Me.cbxMailGebäude.Size = New System.Drawing.Size(80, 22)
+        Me.cbxMailGebäude.TabIndex = 55
+        '
+        'Label8
+        '
+        Me.Label8.AutoSize = True
+        Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label8.Location = New System.Drawing.Point(119, 724)
+        Me.Label8.Name = "Label8"
+        Me.Label8.Size = New System.Drawing.Size(58, 13)
+        Me.Label8.TabIndex = 54
+        Me.Label8.Text = "Gebäude"
+        '
+        'Button1
+        '
+        Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button1.Location = New System.Drawing.Point(228, 734)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(113, 29)
+        Me.Button1.TabIndex = 54
+        Me.Button1.Text = "Email"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'lblWarning
+        '
+        Me.lblWarning.AutoSize = True
+        Me.lblWarning.ForeColor = System.Drawing.Color.Red
+        Me.lblWarning.Location = New System.Drawing.Point(496, 744)
+        Me.lblWarning.Name = "lblWarning"
+        Me.lblWarning.Size = New System.Drawing.Size(0, 13)
+        Me.lblWarning.TabIndex = 58
+        '
+        'Button2
+        '
+        Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.Button2.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button2.Location = New System.Drawing.Point(361, 734)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(113, 29)
+        Me.Button2.TabIndex = 59
+        Me.Button2.Text = "Excel"
+        Me.Button2.UseVisualStyleBackColor = True
+        '
        'frmEssensbestellungenAdministration
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(1242, 767)
+        Me.Controls.Add(Me.Button2)
+        Me.Controls.Add(Me.lblWarning)
+        Me.Controls.Add(Me.Button1)
+        Me.Controls.Add(Me.cbxMailKW)
+        Me.Controls.Add(Me.Label7)
+        Me.Controls.Add(Me.cbxMailGebäude)
        Me.Controls.Add(Me.txtSumme)
+        Me.Controls.Add(Me.Label8)
        Me.Controls.Add(Me.txtAnzahlDS)
        Me.Controls.Add(Me.Label27)
        Me.Controls.Add(Me.Label5)
@@ -643,4 +738,11 @@ Partial Class frmEssensbestellungenAdministration
    Friend WithEvents cbxNichtAbgeschickt As CheckBox
    Friend WithEvents cbKW As VERAG_PROG_ALLGEMEIN.MyComboBox
    Friend WithEvents Label6 As Label
+    Friend WithEvents cbxMailKW As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label7 As Label
+    Friend WithEvents cbxMailGebäude As VERAG_PROG_ALLGEMEIN.MyComboBox
+    Friend WithEvents Label8 As Label
+    Friend WithEvents Button1 As Button
+    Friend WithEvents lblWarning As Label
+    Friend WithEvents Button2 As Button
 End Class
--- a/Aviso/frmEssensbestellungenAdministration.vb
+++ b/Aviso/frmEssensbestellungenAdministration.vb
@@ -1,13 +1,15 @@
-Imports System.Web.UI.HtmlControls
+
+Imports System.Timers
 Imports Microsoft.Office.Interop
 Imports VERAG_PROG_ALLGEMEIN

 Public Class frmEssensbestellungenAdministration

+    Dim dt As DataTable
    Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL

    Private Sub frmEssensbestellungenAdministration_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-
+        lblWarning.Text = ""
        txtBestellDat.Text = Date.Parse("01.01.2001")
        txtBestellDatBis.Text = Now.ToShortDateString
        btnMonat.Text = MONAT.ToString("MMMM")
@@ -19,11 +21,7 @@ Public Class frmEssensbestellungenAdministration
        cbxStornos.Checked = False
        cbxAbgerechnet.Checked = False

-        cboGebaeude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Frontoffice", "Frontoffice"))
-        cboGebaeude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Asfinag", "Asfinag"))
-        cboGebaeude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Verag Verrechnung", "Verag Verrechnung"))
-        cboGebaeude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Maut", "Maut"))
-        cboGebaeude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", ""))
+        cboGebaeude.fillWithSQL("SELECT DISTINCT(eb_gebaeude) FROM [tblEssensbestellungen]", False, "AVISO", True)
        cboGebaeude.changeItem("")

        cboAbteilung.fillWithSQL("SELECT DISTINCT(eb_abteilung) FROM [tblEssensbestellungen]", False, "AVISO", True)
@@ -31,6 +29,13 @@ Public Class frmEssensbestellungenAdministration

        cbKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen]", False, "AVISO", True)

+
+        cbxMailKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen]", False, "AVISO", True)
+        cbxMailKW.changeItem("")
+
+        cbxMailGebäude.changeItem("")
+        cbxMailGebäude.fillWithSQL("SELECT DISTINCT(eb_gebaeude) FROM [tblEssensbestellungen]", False, "AVISO", True)
+
        loadBestellungen()

    End Sub
@@ -304,12 +309,12 @@ Public Class frmEssensbestellungenAdministration
                End Select


-            Case "An Higway 118 schicken"
+            Case "markierte Bestellungen per Mail senden"
                Select Case dgvBestellungen.SelectedRows.Count
                    Case 1
                        If vbYes = MsgBox("Möchten Sie die Essensbestellung '" & dgvBestellungen.SelectedRows(0).Cells("eb_kw").Value & " von Mitarbeiter " & dgvBestellungen.SelectedRows(0).Cells("eb_mitname").Value & " abschicken?", vbYesNoCancel) Then
                            bestellungenSenden(True)
-                            generateEMailforHighway()
+                            generateEMailforHighway(sender, e)
                        Else
                            Exit Sub
                        End If
@@ -317,7 +322,7 @@ Public Class frmEssensbestellungenAdministration

                        If vbYes = MsgBox("Möchten Sie diese " & dgvBestellungen.SelectedRows.Count & " Essensbestellungen abschicken", vbYesNoCancel) Then
                            bestellungenSenden(True)
-                            generateEMailforHighway()
+                            generateEMailforHighway(sender, e)
                        Else
                            Exit Sub
                        End If
@@ -399,77 +404,116 @@ Public Class frmEssensbestellungenAdministration

    End Sub

-    Private Sub generateEMailforHighway()
+    Private Sub generateEMailforHighway(sender As Object, e As EventArgs)

        Me.Cursor = Cursors.WaitCursor
        Try
+            Dim kw As String = ""
+            Dim gebaeude As String = ""
+            Dim TextHTMLtable = ""

-                    Dim outl As New Outlook.Application
-                    Dim Mail As Microsoft.Office.Interop.Outlook.MailItem
+            TextHTMLtable &= "<table border=1>"
+            TextHTMLtable &= "<tr><td>Mitarbeiter</td><td>Montag</td><td>Dienstag</td><td>Mittwoch</td><td>Donnerstag</td><td>Freitag</td><td>Gebäude</td><td>Anmerkung</td></tr>"
+
+            If sender.Text = "Email" Then
+
+                Dim dtBestellungenMail = generateDTBestellungen()
+                kw = cbxMailKW._value
+                gebaeude = cbxMailGebäude._value
+
+                For Each row As DataRow In dtBestellungenMail.Rows
+
+                    TextHTMLtable &= "<tr>"
+                    TextHTMLtable &= "<td><b>" & row("Name") & "</b></td>"
+                    TextHTMLtable &= "<td><b>" & row("Montag") & "</b></td>"
+                    TextHTMLtable &= "<td><b>" & row("Dienstag") & "</b></td>"
+                    TextHTMLtable &= "<td><b>" & row("Mittwoch") & "</b></td>"
+                    TextHTMLtable &= "<td><b>" & row("Donnerstag") & "</b></td>"
+                    TextHTMLtable &= "<td><b>" & row("Freitag") & "</b></td>"
+                    TextHTMLtable &= "<td><b>" & row("Gebaeude") & "</b></td>"
+                    TextHTMLtable &= "<td><b>" & row("Anmerkung") & "</b></td>"
+                    TextHTMLtable &= "</tr>"
+
+                    If row("ID") <> 0 Then
+                        Dim bestellung As New cEssensbestellung(row("KW"), row("ID"))
+
+                        bestellung.eb_gesendet = True
+                        bestellung.eb_gesendet_am = Now
+                        bestellung.SAVE()
+                    End If
+                Next


-                    Mail = outl.CreateItem(0)

-                    Mail.Subject = "Essensbestellung: "
+            Else
+                For Each row In dgvBestellungen.SelectedRows

-                    Dim DETextHTML = ""
-                    DETextHTML &= "Hallo,<br>"
-                    DETextHTML &= "<br>"
-                    DETextHTML &= "Anbei ist die Essensbestellung für .<br>"
+                    TextHTMLtable &= "<tr>"
+                    TextHTMLtable &= "<td><b>" & row.Cells("eb_mitname").Value & "</b></td>"
+                    TextHTMLtable &= "<td><b>" & row.Cells("eb_montag").Value & "</b></td>"
+                    TextHTMLtable &= "<td><b>" & row.Cells("eb_dienstag").Value & "</b></td>"
+                    TextHTMLtable &= "<td><b>" & row.Cells("eb_mittwoch").Value & "</b></td>"
+                    TextHTMLtable &= "<td><b>" & row.Cells("eb_donnerstag").Value & "</b></td>"
+                    TextHTMLtable &= "<td><b>" & row.Cells("eb_freitag").Value & "</b></td>"
+                    TextHTMLtable &= "<td><b>" & row.Cells("eb_gebaeude").Value & "</b></td>"
+                    TextHTMLtable &= "<td><b>" & row.Cells("eb_anmerkung").Value & "</b></td>"
+                    TextHTMLtable &= "</tr>"

-                    Dim TextHTMLtable = ""
+                Next

-                    TextHTMLtable &= "<table border=1>"
-                    TextHTMLtable &= "<tr><td>KW </td><td>Montag</td><td>Dienstag</td><td>Mittwoch</td><td>Donnerstag</td><td>Freitag</td><td>Gebäude</td></tr>"
+            End If
+
+            lblWarning.Text = ""
+
+            Dim outl As New Outlook.Application
+            Dim Mail As Microsoft.Office.Interop.Outlook.MailItem


-                    Dim cnt = 1
-            For Each row In dgvBestellungen.SelectedRows
+            Mail = outl.CreateItem(0)

-                TextHTMLtable &= "<tr>"
-                TextHTMLtable &= "<td><b>" & row.Cells("eb_mitname").Value & "</b></td>"
-                TextHTMLtable &= "<td><b>" & row.Cells("eb_montag").Value & "</b></td>"
-                TextHTMLtable &= "<td><b>" & row.Cells("eb_dienstag").Value & "</b></td>"
-                TextHTMLtable &= "<td><b>" & row.Cells("eb_mittwoch").Value & "</b></td>"
-                TextHTMLtable &= "<td><b>" & row.Cells("eb_donnerstag").Value & "</b></td>"
-                TextHTMLtable &= "<td><b>" & row.Cells("eb_freitag").Value & "</b></td>"
-                TextHTMLtable &= "<td><b>" & row.Cells("eb_gebaeude").Value & "</b></td>"
-                TextHTMLtable &= "</tr>"

-            Next
+            Mail.Subject = "Essensbestellung: " & IIf(kw <> "", kw, "") & " " & IIf(gebaeude <> "", gebaeude, "")
+
+            Dim DETextHTML = ""
+            DETextHTML &= "Hallo,<br>"
+            DETextHTML &= "<br>"
+            DETextHTML &= "Anbei ist die Essensbestellung " & IIf(kw <> "", "für " & kw, "") & ".<br>"

            TextHTMLtable &= "</table>"

-                    Dim EndTextHTML = ""
+            Dim EndTextHTML = ""

-                    EndTextHTML &= "<br>"
-                    EndTextHTML &= "<br>"
+            EndTextHTML &= "<br>"
+            EndTextHTML &= "<br>"
            EndTextHTML &= "Bitte um kurze Bestätigung nach Erhalt der Mail, danke. <br>"
            EndTextHTML &= "<br>"
-                    EndTextHTML &= "Mit freundlichen Grüßen/Best regards<br>"
-                    EndTextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
-                    EndTextHTML &= "<br>"
+            EndTextHTML &= "Mit freundlichen Grüßen/Best regards<br>"
+            EndTextHTML &= VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME & "<br>"
+            EndTextHTML &= "<br>"

            Mail.HTMLBody = "<div style=""font-family:Calibri, Arial;font-size:15px;"">" & DETextHTML & TextHTMLtable & EndTextHTML & SDL.cFakturierung.getSignature("DE") & "</div>"
-                    Mail.Display()
+            Mail.Display()

        Catch ex As Exception
-                    VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!")
-                End Try
+
+            VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name,, "Fehler beim Öffnen der Mail!")
+        End Try


        Me.Cursor = Cursors.Default


-
-
    End Sub

    Private Sub cbKW_SelectedValueChanged(sender As Object, e As EventArgs) Handles cbKW.SelectedValueChanged

-        If cbKW._value Is Nothing Then Exit Sub
+        If cbKW._value Is Nothing Or cbKW._value = "" Then Exit Sub

-        Dim dt As DataTable = SQL.loadDgvBySql("SELECT Top 1 * FROM tblEBMenu where [MenuTitel] = '" & cbKW._value & "' order by MenuDateVon desc", "AVISO", 100, True)
+        If dt IsNot Nothing Then
+            dt.Clear()
+        End If
+
+        dt = SQL.loadDgvBySql("SELECT Top 1 * from (SELECT (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' +  Convert(varchar, Year(MenuDateVon)) as kwDate, MenuDateVon, MenuDateBis FROM tblEBMenu) kwDate where kwDate = '" & cbKW._value & "'", "AVISO", 100, True)

        If dt.Rows.Count > 0 Then

@@ -480,7 +524,145 @@ Public Class frmEssensbestellungenAdministration



+
+    End Sub
+
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click, Button2.Click
+        lblWarning.Text = ""
+
+        If cbxMailKW._value = "" Then
+            lblWarning.Text = "Kalenderwoche auswählen!"
+            Exit Sub
+        End If
+
+        If cbxMailGebäude._value = "" Then
+            lblWarning.Text = "Gebäude auswählen!"
+            Exit Sub
+        End If
+
+        Select Case sender.Text
+
+            Case "Email"
+
+                generateEMailforHighway(sender, e)
+
+            Case "Excel"
+
+                SDL.cProgramFunctions.genExcelFromDT_NEW(generateDTBestellungen())
+
+        End Select
+
    End Sub


+    Private Function generateDTBestellungen() 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,
+                                    [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"
+
+        dtBestellungen = SQL.loadDgvBySql(SQLStringBEstellungen, "AVISO", 100, True)
+
+
+        Dim uniqueMenusMontag = dtBestellungen.AsEnumerable() _
+                        .GroupBy(Function(row) _
+                        New With
+                        {
+                        Key .Montag = row.Field(Of String)("Montag")
+                       }
+                   )
+
+
+        Dim uniqueMenusDienstag = dtBestellungen.AsEnumerable() _
+                        .GroupBy(Function(row) _
+                        New With
+                        {
+                            Key .Dienstag = row.Field(Of String)("Dienstag")
+                       }
+                   )
+
+        Dim uniqueMenusMittwoch = dtBestellungen.AsEnumerable() _
+                        .GroupBy(Function(row) _
+                        New With
+                        {
+                            Key .Mittwoch = row.Field(Of String)("Mittwoch")
+                       }
+                   )
+
+
+        Dim uniqueMenusDonnerstag = dtBestellungen.AsEnumerable() _
+                        .GroupBy(Function(row) _
+                        New With
+                        {
+                            Key .Donnerstag = row.Field(Of String)("Donnerstag")
+                       }
+                   )
+
+        Dim uniqueMenusFreitag = dtBestellungen.AsEnumerable() _
+                        .GroupBy(Function(row) _
+                        New With
+                        {
+                            Key .Freitag = row.Field(Of String)("Freitag")
+                       }
+                   )
+
+
+
+        Dim resultMontag, resultDienstag, resultMittwoch, resultDonnerstag, resultFreitag As String
+
+
+        For Each el In uniqueMenusMontag
+            resultMontag &= IIf(el.Key.Montag <> "", String.Format("{0} {1}x ", el.Key.Montag, el.Count()), "")
+        Next
+
+        For Each el In uniqueMenusDienstag
+            resultDienstag &= IIf(el.Key.Dienstag <> "", String.Format("{0} {1}x ", el.Key.Dienstag, el.Count()), "")
+        Next
+
+        For Each el In uniqueMenusMittwoch
+            resultMittwoch &= IIf(el.Key.Mittwoch <> "", String.Format("{0} {1}x ", el.Key.Mittwoch, el.Count()), "")
+        Next
+
+        For Each el In uniqueMenusDonnerstag
+            resultDonnerstag &= IIf(el.Key.Donnerstag <> "", String.Format("{0} {1}x ", el.Key.Donnerstag, el.Count()), "")
+        Next
+        For Each el In uniqueMenusFreitag
+            resultFreitag &= IIf(el.Key.Freitag <> "", String.Format("{0} {1}x ", el.Key.Freitag, el.Count()), "")
+        Next
+
+
+        Dim R As DataRow = dtBestellungen.NewRow
+        R("ID") = 0
+        R("KW") = "-"
+        R("Name") = "-"
+        R("KW") = "Summe"
+        R("Gebaeude") = "-"
+        R("Name") = "-"
+        R("Gebaeude") = "-"
+        R("Abteilung") = "-"
+        R("Datum") = DateTime.Now()
+        R("Storniert") = True
+        R("Montag") = String.Join(" ", resultMontag)
+        R("Dienstag") = String.Join(" ", resultDienstag)
+        R("Mittwoch") = String.Join(" ", resultMittwoch)
+        R("Donnerstag") = String.Join(" ", resultDonnerstag)
+        R("Freitag") = String.Join(" ", resultFreitag)
+        dtBestellungen.Rows.Add(R)
+
+        ' MessageBox.Show(String.Join(Environment.NewLine, result))
+
+        If dtBestellungen.Rows.Count = 0 Then
+            lblWarning.Text = "keine Datensätze vorhanden"
+            Me.Cursor = Cursors.Default
+            Exit Function
+        End If
+
+        Return dtBestellungen
+
+    End Function
+
 End Class
--- a/Aviso/frmSendungsdetailsNEU.vb
+++ b/Aviso/frmSendungsdetailsNEU.vb
@@ -5468,12 +5468,12 @@ Public Class frmSendungsdetailsNEU

                        Mail = CType(olSess.OpenSharedItem(PathTmpANH), Outlook.MailItem)

-                        For Each account In accounts
-                            If account.UserName.ToString = "brexit" Then
-                                Mail.SentOnBehalfOfName = "brexit@verag.ag" 'account.SmtpAddress.ToString
+                        'For Each account In accounts
+                        '    If account.UserName.ToString = "brexit" Then
+                        '        Mail.SentOnBehalfOfName = "brexit@verag.ag" 'account.SmtpAddress.ToString

-                            End If
-                        Next
+                        '    End If
+                        'Next

                        Mail = Mail.ReplyAll
                        isReply = True