Essensbestellungen

2023-01-24 16:15:55 +01:00
parent 114bcc7e0b
commit ba000ef639
3 changed files with 51 additions and 46 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.5.7")>
-<Assembly: AssemblyFileVersion("3.8.5.7")>
+<Assembly: AssemblyVersion("3.8.5.8")>
+<Assembly: AssemblyFileVersion("3.8.5.8")>
--- a/Aviso/frmEssensbestellungenAdministration.Designer.vb
+++ b/Aviso/frmEssensbestellungenAdministration.Designer.vb
@@ -28,6 +28,8 @@ 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.txtMarkierteDS = New VERAG_PROG_ALLGEMEIN.MyTextBox()
+        Me.Label11 = New System.Windows.Forms.Label()
        Me.btnNew = New System.Windows.Forms.Button()
        Me.cbKW = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.Label6 = New System.Windows.Forms.Label()
@@ -73,8 +75,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.Label11 = New System.Windows.Forms.Label()
-        Me.txtMarkierteDS = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.pnlTop.SuspendLayout()
        Me.Panel1.SuspendLayout()
        Me.ContextMenuStrip1.SuspendLayout()
@@ -149,6 +149,42 @@ Partial Class frmEssensbestellungenAdministration
        Me.Panel1.Size = New System.Drawing.Size(1242, 85)
        Me.Panel1.TabIndex = 2
        '
+        'txtMarkierteDS
+        '
+        Me.txtMarkierteDS._DateTimeOnly = False
+        Me.txtMarkierteDS._numbersOnly = False
+        Me.txtMarkierteDS._numbersOnlyKommastellen = ""
+        Me.txtMarkierteDS._numbersOnlyTrennzeichen = False
+        Me.txtMarkierteDS._Prozent = False
+        Me.txtMarkierteDS._ShortDateNew = False
+        Me.txtMarkierteDS._ShortDateOnly = False
+        Me.txtMarkierteDS._TimeOnly = False
+        Me.txtMarkierteDS._TimeOnly_Seconds = False
+        Me.txtMarkierteDS._value = ""
+        Me.txtMarkierteDS._Waehrung = True
+        Me.txtMarkierteDS._WaehrungZeichen = True
+        Me.txtMarkierteDS.ForeColor = System.Drawing.Color.Black
+        Me.txtMarkierteDS.Location = New System.Drawing.Point(1035, 62)
+        Me.txtMarkierteDS.MaxLineLength = -1
+        Me.txtMarkierteDS.MaxLines_Warning = ""
+        Me.txtMarkierteDS.MaxLines_Warning_Label = Nothing
+        Me.txtMarkierteDS.Name = "txtMarkierteDS"
+        Me.txtMarkierteDS.ReadOnly = True
+        Me.txtMarkierteDS.Size = New System.Drawing.Size(68, 20)
+        Me.txtMarkierteDS.TabIndex = 65
+        Me.txtMarkierteDS.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
+        '
+        'Label11
+        '
+        Me.Label11.AutoSize = True
+        Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label11.Location = New System.Drawing.Point(1032, 46)
+        Me.Label11.Name = "Label11"
+        Me.Label11.Size = New System.Drawing.Size(125, 13)
+        Me.Label11.TabIndex = 66
+        Me.Label11.Text = "Betrag markierte DS:"
+        Me.Label11.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
        'btnNew
        '
        Me.btnNew.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -173,7 +209,7 @@ Partial Class frmEssensbestellungenAdministration
        Me.cbKW.FormattingEnabled = True
        Me.cbKW.Location = New System.Drawing.Point(311, 29)
        Me.cbKW.Name = "cbKW"
-        Me.cbKW.Size = New System.Drawing.Size(80, 22)
+        Me.cbKW.Size = New System.Drawing.Size(99, 22)
        Me.cbKW.TabIndex = 53
        '
        'Label6
@@ -528,7 +564,7 @@ Partial Class frmEssensbestellungenAdministration
        '
        Me.AbgerechnetToolStripMenuItem.Name = "AbgerechnetToolStripMenuItem"
        Me.AbgerechnetToolStripMenuItem.Size = New System.Drawing.Size(282, 22)
-        Me.AbgerechnetToolStripMenuItem.Text = "abgerechnet"
+        Me.AbgerechnetToolStripMenuItem.Text = "abrechnen"
        '
        'BearbeitenToolStripMenuItem
        '
@@ -700,42 +736,6 @@ Partial Class frmEssensbestellungenAdministration
        Me.Label9.Text = "Gesamtbetrag"
        Me.Label9.TextAlign = System.Drawing.ContentAlignment.TopRight
        '
-        'Label11
-        '
-        Me.Label11.AutoSize = True
-        Me.Label11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label11.Location = New System.Drawing.Point(1032, 46)
-        Me.Label11.Name = "Label11"
-        Me.Label11.Size = New System.Drawing.Size(125, 13)
-        Me.Label11.TabIndex = 66
-        Me.Label11.Text = "Betrag markierte DS:"
-        Me.Label11.TextAlign = System.Drawing.ContentAlignment.TopRight
-        '
-        'txtMarkierteDS
-        '
-        Me.txtMarkierteDS._DateTimeOnly = False
-        Me.txtMarkierteDS._numbersOnly = False
-        Me.txtMarkierteDS._numbersOnlyKommastellen = ""
-        Me.txtMarkierteDS._numbersOnlyTrennzeichen = False
-        Me.txtMarkierteDS._Prozent = False
-        Me.txtMarkierteDS._ShortDateNew = False
-        Me.txtMarkierteDS._ShortDateOnly = False
-        Me.txtMarkierteDS._TimeOnly = False
-        Me.txtMarkierteDS._TimeOnly_Seconds = False
-        Me.txtMarkierteDS._value = ""
-        Me.txtMarkierteDS._Waehrung = True
-        Me.txtMarkierteDS._WaehrungZeichen = True
-        Me.txtMarkierteDS.ForeColor = System.Drawing.Color.Black
-        Me.txtMarkierteDS.Location = New System.Drawing.Point(1035, 62)
-        Me.txtMarkierteDS.MaxLineLength = -1
-        Me.txtMarkierteDS.MaxLines_Warning = ""
-        Me.txtMarkierteDS.MaxLines_Warning_Label = Nothing
-        Me.txtMarkierteDS.Name = "txtMarkierteDS"
-        Me.txtMarkierteDS.ReadOnly = True
-        Me.txtMarkierteDS.Size = New System.Drawing.Size(68, 20)
-        Me.txtMarkierteDS.TabIndex = 65
-        Me.txtMarkierteDS.TextAlign = System.Windows.Forms.HorizontalAlignment.Right
-        '
        'frmEssensbestellungenAdministration
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
--- a/Aviso/frmEssensbestellungenAdministration.vb
+++ b/Aviso/frmEssensbestellungenAdministration.vb
@@ -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")
-        txtBestellDatBis.Text = Now.ToShortDateString
+        txtBestellDatBis.Text = Today.AddDays(7).ToShortDateString
        btnMonat.Text = MONAT.ToString("MMMM")
        btnJahr.Text = JAHR.Year

@@ -27,7 +27,7 @@ Public Class frmEssensbestellungenAdministration
        cboAbteilung.fillWithSQL("SELECT DISTINCT(eb_abteilung) FROM [tblEssensbestellungen]", False, "AVISO", True)
        cboAbteilung.changeItem("")

-        cbKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen]", False, "AVISO", True)
+        cbKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen] ORDER BY eb_kw desc", False, "AVISO", True)


        cbxMailKW.fillWithSQL("SELECT DISTINCT(eb_kw) FROM [tblEssensbestellungen]", False, "AVISO", True)
@@ -99,6 +99,11 @@ Public Class frmEssensbestellungenAdministration


        For Each row As DataGridViewRow In dgvBestellungen.Rows
+
+            If Not IsDBNull(row.Cells("eb_gesendet").Value) Then
+                If row.Cells("eb_gesendet").Value Then row.DefaultCellStyle.BackColor = Color.LightYellow
+            End If
+
            If Not IsDBNull(row.Cells("eb_storniert").Value) Then
                If row.Cells("eb_storniert").Value Then
                    row.DefaultCellStyle.BackColor = Color.IndianRed
@@ -273,7 +278,7 @@ Public Class frmEssensbestellungenAdministration
        If dgvBestellungen.SelectedRows.Count = 0 Then Exit Sub

        Select Case sender.Text
-            Case "abgerechnen"
+            Case "abrechnen"
                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 & " abrechnen", vbYesNoCancel) Then
@@ -336,7 +341,7 @@ Public Class frmEssensbestellungenAdministration


        End Select
-
+        loadBestellungen()

    End Sub
    Private Sub bestellungenStornieren(stornieren As Boolean)