Essenbestellungen, Ueberstunden

This commit is contained in:
2024-03-25 08:52:07 +01:00
parent 585f5cbf75
commit 826e83bf5d
3 changed files with 100 additions and 58 deletions

View File

@@ -28,6 +28,7 @@ Partial Class frmEssensbestellungenAdministration
Me.Label4 = New System.Windows.Forms.Label()
Me.Label22 = New System.Windows.Forms.Label()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.cbxCurrenyear = New System.Windows.Forms.CheckBox()
Me.cbxAlleAnzeigen = New System.Windows.Forms.CheckBox()
Me.lblBestellungBis = New System.Windows.Forms.Label()
Me.btnBestelllimit = New System.Windows.Forms.Button()
@@ -82,7 +83,6 @@ Partial Class frmEssensbestellungenAdministration
Me.lblWarning = New System.Windows.Forms.Label()
Me.Button2 = New System.Windows.Forms.Button()
Me.Label9 = New System.Windows.Forms.Label()
Me.cbxCurrenyear = New System.Windows.Forms.CheckBox()
Me.pnlTop.SuspendLayout()
Me.Panel1.SuspendLayout()
Me.ContextMenuStrip1.SuspendLayout()
@@ -163,6 +163,17 @@ Partial Class frmEssensbestellungenAdministration
Me.Panel1.Size = New System.Drawing.Size(1242, 106)
Me.Panel1.TabIndex = 2
'
'cbxCurrenyear
'
Me.cbxCurrenyear.AutoSize = True
Me.cbxCurrenyear.Checked = True
Me.cbxCurrenyear.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxCurrenyear.Location = New System.Drawing.Point(296, 12)
Me.cbxCurrenyear.Name = "cbxCurrenyear"
Me.cbxCurrenyear.Size = New System.Drawing.Size(15, 14)
Me.cbxCurrenyear.TabIndex = 73
Me.cbxCurrenyear.UseVisualStyleBackColor = True
'
'cbxAlleAnzeigen
'
Me.cbxAlleAnzeigen.AutoSize = True
@@ -825,17 +836,6 @@ Partial Class frmEssensbestellungenAdministration
Me.Label9.Text = "Gesamtbetrag"
Me.Label9.TextAlign = System.Drawing.ContentAlignment.TopRight
'
'cbxCurrenyear
'
Me.cbxCurrenyear.AutoSize = True
Me.cbxCurrenyear.Checked = True
Me.cbxCurrenyear.CheckState = System.Windows.Forms.CheckState.Checked
Me.cbxCurrenyear.Location = New System.Drawing.Point(296, 12)
Me.cbxCurrenyear.Name = "cbxCurrenyear"
Me.cbxCurrenyear.Size = New System.Drawing.Size(15, 14)
Me.cbxCurrenyear.TabIndex = 73
Me.cbxCurrenyear.UseVisualStyleBackColor = True
'
'frmEssensbestellungenAdministration
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

View File

@@ -68,7 +68,10 @@ Public Class frmEssensbestellungenAdministration
.Columns("eb_kw").HeaderText = "KW"
.Columns("eb_kw").Width = 80
.Columns("eb_mitid").HeaderText = "MID"
.Columns("eb_mitid").HeaderText = "MID"
.Columns("eb_mitid").Width = 40
.Columns("eb_mitid").HeaderText = "MID"
.Columns("eb_mitid").Visible = False
.Columns("eb_mitname").HeaderText = "Mitarbeiter"
.Columns("eb_mitname").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
.Columns("eb_abteilung").Visible = False
@@ -636,7 +639,7 @@ Public Class frmEssensbestellungenAdministration
If cAllgemein.MITARBEITER.getFirma = "UNISPED" Then
sqlWhere &= " And eb_firma = '" & cAllgemein.MITARBEITER.getFirma & "' "
Else
sqlWhere &= " And eb_firma = 'VERAG' OR eb_firma = 'IMEX' OR eb_firma = 'FRONTOFFICE'"
sqlWhere &= " And (eb_firma = 'VERAG' OR eb_firma = 'IMEX' OR eb_firma = 'FRONTOFFICE')"
End If
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,
@@ -721,15 +724,15 @@ Public Class frmEssensbestellungenAdministration
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 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 dtMenu = SQL.loadDgvBySql(SQLStringMenues, "AVISO", 100, True)
@@ -947,6 +950,7 @@ Public Class frmEssensbestellungenAdministration
End Sub
'Private Sub cbxCurrenyear_CheckedChanged(sender As Object, e As EventArgs) Handles cbxCurrenyear.CheckedChanged
' changeYear()
'End Sub