Bug FaktEmail, Essensbestellungen, Formulare, Ueberstunden

This commit is contained in:
2024-03-19 16:59:27 +01:00
parent cc4afae048
commit 9724abd612
8 changed files with 55 additions and 18 deletions

View File

@@ -11,7 +11,7 @@ Public Class frmEssensbestellungenAdministration
Private Sub frmEssensbestellungenAdministration_Load(sender As Object, e As EventArgs) Handles MyBase.Load
lblWarning.Text = ""
txtBestellDat.Text = Date.Parse("01.01.2001")
txtBestellDat.Text = Today.ToShortDateString 'Date.Parse("01.01.2001")
txtBestellDatBis.Text = Today.AddDays(7).ToShortDateString
btnMonat.Text = MONAT.ToString("MMMM")
btnJahr.Text = JAHR.Year
@@ -31,7 +31,7 @@ Public Class frmEssensbestellungenAdministration
cbKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen] UNION SELECT (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)) as kwDateNew FROM [tblEBMenu] where MenuDateVon > GETDATE() ORDER BY eb_kw desc", False, "AVISO", True)
cbxMailKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen] ORDER BY eb_kw desc", False, "AVISO", True)
cbxMailKW.fillWithSQL("SELECT top(30) DISTINCT(eb_kw) FROM [tblEssensbestellungen] ORDER BY eb_kw desc", False, "AVISO", True)
cbxMailKW.changeItem("")
cbxMailGebäude.changeItem("")
@@ -720,6 +720,19 @@ Public Class frmEssensbestellungenAdministration
Next
Dim SQLStringMenues As String = "SELECT TOP (1) [MenuEssenMoDate] as Montag
,[MenuEssenDiDate] as Dienstag
,[MenuEssenMiDate] as Mittwoch
,[MenuEssenDoDate] as Donnerstag
,[MenuEssenFrDate] as Freitag
FROM
[tblEBMenu] WHERE eb_kw = '" & cbxMailKW._value & "' AND eb_gebaeude = '" & cbxMailGebäude._value & "' AND ISNULL(eb_storniert,1)=0 " & sqlWhere & " Order by eb_datum"
Dim dtMenu = SQL.loadDgvBySql(SQLStringMenues, "AVISO", 100, True)
Dim R As DataRow = dtBestellungen.NewRow
R("ID") = "0"
R("KW") = "-"