diff --git a/Aviso/UsrCntlEssensbestellungen.vb b/Aviso/UsrCntlEssensbestellungen.vb index 32e40bb..03bd958 100644 --- a/Aviso/UsrCntlEssensbestellungen.vb +++ b/Aviso/UsrCntlEssensbestellungen.vb @@ -24,7 +24,7 @@ Public Class UsrCntlessensbestellungen End Sub - Sub New(storniert As Boolean, abgerechnet As Boolean, menu As String) + Sub New(storniert As Boolean, abgerechnet As Boolean, menutitle As String) ' Dieser Aufruf ist für den Designer erforderlich. @@ -34,7 +34,7 @@ Public Class UsrCntlessensbestellungen 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 Case Top 1 * from (Select (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)) as kwDate, * FROM tblEBMenu) kwDate where kwDate = '" & menu & "'", "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 = '" & menutitle & "'", "AVISO", 100, True) loadMenuInfo(dt) essen = New cEssensbestellung() txtGebäude.Text = essen.eb_gebaeude.ToString @@ -55,7 +55,7 @@ Public Class UsrCntlessensbestellungen 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 Case Top 1 * from (Select (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' + Convert(varchar, Year(MenuDateVon)) as kwDate, * FROM tblEBMenu) kwDate where kwDate = '" & menutitle & "'", "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 = '" & menutitle & "'", "AVISO", 100, True) loadMenuInfo(dt) txtGebäude.Text = essen.eb_gebaeude.ToString txtAnmerkung.Text = essen.eb_anmerkung.ToString diff --git a/Aviso/frmEssensbestellungenAdministration.Designer.vb b/Aviso/frmEssensbestellungenAdministration.Designer.vb index 280dea7..5782b74 100644 --- a/Aviso/frmEssensbestellungenAdministration.Designer.vb +++ b/Aviso/frmEssensbestellungenAdministration.Designer.vb @@ -70,6 +70,7 @@ Partial Class frmEssensbestellungenAdministration Me.Button1 = New System.Windows.Forms.Button() Me.lblWarning = New System.Windows.Forms.Label() Me.Button2 = New System.Windows.Forms.Button() + Me.Label9 = New System.Windows.Forms.Label() Me.pnlTop.SuspendLayout() Me.Panel1.SuspendLayout() Me.ContextMenuStrip1.SuspendLayout() @@ -522,17 +523,18 @@ Partial Class frmEssensbestellungenAdministration ' 'txtAnzahlDS ' - Me.txtAnzahlDS.Location = New System.Drawing.Point(1170, 741) + Me.txtAnzahlDS.Location = New System.Drawing.Point(1020, 744) Me.txtAnzahlDS.Name = "txtAnzahlDS" Me.txtAnzahlDS.ReadOnly = True - Me.txtAnzahlDS.Size = New System.Drawing.Size(60, 20) + Me.txtAnzahlDS.Size = New System.Drawing.Size(42, 20) Me.txtAnzahlDS.TabIndex = 45 + Me.txtAnzahlDS.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'Label27 ' 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, 744) + Me.Label27.Location = New System.Drawing.Point(1080, 748) Me.Label27.Name = "Label27" Me.Label27.Size = New System.Drawing.Size(45, 13) Me.Label27.TabIndex = 46 @@ -542,7 +544,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, 745) + Me.Label5.Location = New System.Drawing.Point(913, 747) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(99, 13) Me.Label5.TabIndex = 44 @@ -563,7 +565,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, 741) + Me.txtSumme.Location = New System.Drawing.Point(1130, 744) Me.txtSumme.MaxLineLength = -1 Me.txtSumme.MaxLines_Warning = "" Me.txtSumme.MaxLines_Warning_Label = Nothing @@ -571,6 +573,7 @@ Partial Class frmEssensbestellungenAdministration Me.txtSumme.ReadOnly = True Me.txtSumme.Size = New System.Drawing.Size(100, 20) Me.txtSumme.TabIndex = 47 + Me.txtSumme.TextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'dgvBestellungen ' @@ -665,11 +668,22 @@ Partial Class frmEssensbestellungenAdministration Me.Button2.Text = "Excel" Me.Button2.UseVisualStyleBackColor = True ' + 'Label9 + ' + Me.Label9.AutoSize = True + Me.Label9.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label9.Location = New System.Drawing.Point(1080, 728) + Me.Label9.Name = "Label9" + Me.Label9.Size = New System.Drawing.Size(85, 13) + Me.Label9.TabIndex = 60 + Me.Label9.Text = "Gesamtbetrag" + ' '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.Label9) Me.Controls.Add(Me.Button2) Me.Controls.Add(Me.lblWarning) Me.Controls.Add(Me.Button1) @@ -745,4 +759,5 @@ Partial Class frmEssensbestellungenAdministration Friend WithEvents Button1 As Button Friend WithEvents lblWarning As Label Friend WithEvents Button2 As Button + Friend WithEvents Label9 As Label End Class diff --git a/Aviso/frmEssensbestellungenAdministration.vb b/Aviso/frmEssensbestellungenAdministration.vb index 0fd6aab..12517a5 100644 --- a/Aviso/frmEssensbestellungenAdministration.vb +++ b/Aviso/frmEssensbestellungenAdministration.vb @@ -218,7 +218,7 @@ Public Class frmEssensbestellungenAdministration End Sub Private Sub FlatButton7_Click(sender As Object, e As EventArgs) Handles FlatButton7.Click - + cbKW.changeItem("") txtMitarbeiter.Text = "" cboGebaeude.changeItem("") cboAbteilung.changeItem("") @@ -645,7 +645,7 @@ Public Class frmEssensbestellungenAdministration R("Gebaeude") = "-" R("Abteilung") = "-" R("Datum") = DateTime.Now() - R("Storniert") = True + R("Storniert") = DBNull.Value R("Montag") = String.Join(" ", resultMontag) R("Dienstag") = String.Join(" ", resultDienstag) R("Mittwoch") = String.Join(" ", resultMittwoch) diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index dec4b2c..07ad372 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -554,6 +554,12 @@ Public Class frmHauptfenster End Select End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("ADMIN_ESSENSBESTELLUNGEN", "AVISO") Then + AdministrationEssensbestellungenToolStripMenuItem.Visible = True + End If + + + Panel1.Height -= pnlSearch.Height If Now.ToShortDateString >= DateTime.Parse("01/01/2023") Then