Essensbestellungen GUIVerbesserungen

2022-11-30 14:34:57 +01:00
parent 72693343d8
commit 67601f4ee3
2 changed files with 60 additions and 39 deletions
--- a/Aviso/frmEssensbestellungen.Designer.vb
+++ b/Aviso/frmEssensbestellungen.Designer.vb
@@ -23,9 +23,9 @@ Partial Class frmEssensbestellungen
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.lblWochenkarte = New System.Windows.Forms.Label()
        Me.btnSave = New System.Windows.Forms.Button()
        Me.lblDatum = New System.Windows.Forms.Label()
@@ -40,6 +40,7 @@ Partial Class frmEssensbestellungen
        Me.lblBestellungBis = New System.Windows.Forms.Label()
        Me.cbxGebauede = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.MyPanel1 = New VERAG_PROG_ALLGEMEIN.MyPanel(Me.components)
+        Me.Button1 = New System.Windows.Forms.Button()
        Me.txtPreis = New System.Windows.Forms.Label()
        Me.Label2 = New System.Windows.Forms.Label()
        Me.Dienstag = New System.Windows.Forms.GroupBox()
@@ -78,8 +79,8 @@ Partial Class frmEssensbestellungen
        Me.txtAnzahlMenu = New System.Windows.Forms.Label()
        Me.dgvBestellungen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.cbxMenu = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.Button1 = New System.Windows.Forms.Button()
        Me.txtAbteilung = New System.Windows.Forms.Label()
+        Me.Button2 = New System.Windows.Forms.Button()
        Me.MyPanel1.SuspendLayout()
        Me.Dienstag.SuspendLayout()
        CType(Me.pbDienstag, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -189,6 +190,16 @@ Partial Class frmEssensbestellungen
        Me.MyPanel1.Size = New System.Drawing.Size(667, 240)
        Me.MyPanel1.TabIndex = 18
        '
+        'Button1
+        '
+        Me.Button1.Image = Global.AVISO.My.Resources.Resources.pdf1
+        Me.Button1.Location = New System.Drawing.Point(590, 147)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(61, 57)
+        Me.Button1.TabIndex = 20
+        Me.Button1.UseVisualStyleBackColor = True
+        Me.Button1.Visible = False
+        '
        'txtPreis
        '
        Me.txtPreis.AutoSize = True
@@ -662,34 +673,34 @@ Partial Class frmEssensbestellungen
        Me.dgvBestellungen.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.dgvBestellungen.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle10.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvBestellungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle10
+        DataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvBestellungen.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle1
        Me.dgvBestellungen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText
-        DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.dgvBestellungen.DefaultCellStyle = DataGridViewCellStyle11
+        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.dgvBestellungen.DefaultCellStyle = DataGridViewCellStyle2
        Me.dgvBestellungen.Location = New System.Drawing.Point(16, 351)
        Me.dgvBestellungen.Name = "dgvBestellungen"
        Me.dgvBestellungen.ReadOnly = True
-        DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.dgvBestellungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle12
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.dgvBestellungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
        Me.dgvBestellungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
        Me.dgvBestellungen.ShowEditingIcon = False
        Me.dgvBestellungen.Size = New System.Drawing.Size(663, 127)
@@ -707,16 +718,6 @@ Partial Class frmEssensbestellungen
        Me.cbxMenu.Size = New System.Drawing.Size(136, 21)
        Me.cbxMenu.TabIndex = 0
        '
-        'Button1
-        '
-        Me.Button1.Image = Global.AVISO.My.Resources.Resources.pdf1
-        Me.Button1.Location = New System.Drawing.Point(590, 147)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(61, 57)
-        Me.Button1.TabIndex = 20
-        Me.Button1.UseVisualStyleBackColor = True
-        Me.Button1.Visible = False
-        '
        'txtAbteilung
        '
        Me.txtAbteilung.AutoSize = True
@@ -726,11 +727,21 @@ Partial Class frmEssensbestellungen
        Me.txtAbteilung.TabIndex = 23
        Me.txtAbteilung.Text = "EDV"
        '
+        'Button2
+        '
+        Me.Button2.Location = New System.Drawing.Point(499, 324)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(180, 21)
+        Me.Button2.TabIndex = 25
+        Me.Button2.Text = "alle Bestellungen anzeigen"
+        Me.Button2.UseVisualStyleBackColor = True
+        '
        'frmEssensbestellungen
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(687, 518)
+        Me.Controls.Add(Me.Button2)
        Me.Controls.Add(Me.txtAbteilung)
        Me.Controls.Add(Me.lblBestellungBis)
        Me.Controls.Add(Me.cbxGebauede)
@@ -822,4 +833,5 @@ Partial Class frmEssensbestellungen
    Friend WithEvents lblBestellungBis As Label
    Friend WithEvents Button1 As Button
    Friend WithEvents txtAbteilung As Label
+    Friend WithEvents Button2 As Button
 End Class
--- a/Aviso/frmEssensbestellungen.vb
+++ b/Aviso/frmEssensbestellungen.vb
@@ -108,6 +108,8 @@ Public Class frmEssensbestellungen

        If cbxMenu._value Is Nothing Or cbxMenu._value = "" Then
            Button1.Visible = False
+            lblDatum.Text = "Datum: "
+            lblBestellungBis.Text = ""
            loadDGVBestellungen()
            btnSave.Enabled = False
            Exit Sub
@@ -241,7 +243,7 @@ Public Class frmEssensbestellungen
            .Columns("eb_kw").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
            .Columns("eb_kw").HeaderText = "KW"
            .Columns("eb_mitid").Visible = False
-            .Columns("eb_gebaeude").Visible = False
+
            .Columns("eb_abteilung").Visible = False
            .Columns("eb_montag").Width = 80
            .Columns("eb_montag").HeaderText = "Montag"
@@ -254,6 +256,8 @@ Public Class frmEssensbestellungen
            .Columns("eb_donnerstag").Width = 80
            .Columns("eb_freitag").HeaderText = "Freitag"
            .Columns("eb_freitag").Width = 80
+            .Columns("eb_gebaeude").HeaderText = "Gebäude"
+            .Columns("eb_gebaeude").Width = 80
            .Columns("eb_preis").HeaderText = "Preis"
            .Columns("eb_preis").Width = 40
            .Columns("eb_preis").DefaultCellStyle.Format = "N"
@@ -460,4 +464,9 @@ Public Class frmEssensbestellungen
    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
        'Process.Start("\\YM5T001348\Gastro\FTPUpload\Menues\" & cbxMenu._value & ".pdf")
    End Sub
+
+
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+        cbxMenu.changeItem("")
+    End Sub
 End Class