From b73bb673491e040706246fc4b68053a5eeb5b8c7 Mon Sep 17 00:00:00 2001
From: "d.breimaier" <d.breimaier@verag.ag>
Date: Wed, 30 Nov 2022 10:24:58 +0100
Subject: [PATCH] Essensbestellungen

---
 Aviso/frmEssensbestellungen.Designer.vb | 4 +++-
 Aviso/frmEssensbestellungen.vb          | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Aviso/frmEssensbestellungen.Designer.vb b/Aviso/frmEssensbestellungen.Designer.vb
index 38051c0..62c873a 100644
--- a/Aviso/frmEssensbestellungen.Designer.vb
+++ b/Aviso/frmEssensbestellungen.Designer.vb
@@ -158,8 +158,9 @@ Partial Class frmEssensbestellungen
         'cbxGebauede
         '
         Me.cbxGebauede._allowedValuesFreiText = Nothing
-        Me.cbxGebauede._allowFreiText = False
+        Me.cbxGebauede._allowFreiText = True
         Me.cbxGebauede._value = ""
+        Me.cbxGebauede.DropDownWidth = 150
         Me.cbxGebauede.FormattingEnabled = True
         Me.cbxGebauede.Location = New System.Drawing.Point(580, 24)
         Me.cbxGebauede.Name = "cbxGebauede"
@@ -693,6 +694,7 @@ Partial Class frmEssensbestellungen
         Me.cbxMenu._allowedValuesFreiText = Nothing
         Me.cbxMenu._allowFreiText = False
         Me.cbxMenu._value = ""
+        Me.cbxMenu.DropDownWidth = 200
         Me.cbxMenu.FormattingEnabled = True
         Me.cbxMenu.Location = New System.Drawing.Point(12, 30)
         Me.cbxMenu.Name = "cbxMenu"
diff --git a/Aviso/frmEssensbestellungen.vb b/Aviso/frmEssensbestellungen.vb
index fbe3edb..3419059 100644
--- a/Aviso/frmEssensbestellungen.vb
+++ b/Aviso/frmEssensbestellungen.vb
@@ -11,7 +11,7 @@ Public Class frmEssensbestellungen
 
     Private Sub frmEssensbestellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load
 
-        cbxMenu.fillWithSQL("SELECT MenuTitel from tblEBMenu", False, "AVISO", True)
+        cbxMenu.fillWithSQL("SELECT Distinct (MenuDateVon), MenuTitel from tblEBMenu  where MenuDateVon >= GETDATE() order by MenuDateVon desc", True, "AVISO", True)
 
         lblGebaeude.Text = "Gebäude: "
         lblAbteilung.Text = "Abteilung: " & VERAG_PROG_ALLGEMEIN.cAllgemein.ABTEILUNG
@@ -107,7 +107,7 @@ Public Class frmEssensbestellungen
 
 
         dt.Clear()
-        dt = SQL.loadDgvBySql("SELECT * FROM tblEBMenu where [MenuTitel] = '" & cbxMenu._value & "'", "AVISO", 100, True)
+        dt = SQL.loadDgvBySql("SELECT * FROM tblEBMenu where [MenuDateVon] = '" & cbxMenu._value & "'", "AVISO", 100, True)
 
         If dt.Rows.Count > 0 Then
             If checkIfOrderIsPossible() Then