Warenorte und Essensbestellungen -> richtiges Logo hinzugefügt.

2023-01-11 15:43:56 +01:00
parent bdee5e1176
commit f0e5b06e4a
7 changed files with 12468 additions and 36 deletions
--- a/Aviso/UsrCntlEssensbestellungen.vb
+++ b/Aviso/UsrCntlEssensbestellungen.vb
@@ -583,7 +583,7 @@ Public Class UsrCntlessensbestellungen


        cbxMenu.fillWithSQL("SELECT Distinct Top 10 (REPLACE(MenuTitel,'Wochenkarte ','')) + ' - ' +  Convert(varchar, Year(MenuDateVon)), MenuDateVon from tblEBMenu order by MenuDateVon desc", True, "AVISO", True) '/ where MenuDateVon >= GETDATE() 
-        cbxMitarbeiter.fillWithSQL("SELECT top 100 [mit_id], ([mit_vname] + ' ' + [mit_nname]) as name FROM [tblMitarbeiter] where mit_gekuendigt = 0 order by name ", False, "ADMIN", True)
+        cbxMitarbeiter.fillWithSQL("SELECT top 100 [mit_id], ([mit_vname] + ' ' + [mit_nname]) as name FROM [tblMitarbeiter] where [mit_ChatBenutzer] = 1 AND [mit_pseudoUser] = 0 AND [mit_gekuendigt] = 0 AND (CAse when mit_firma = 'ALL' Then mit_FirmaHaupt else mit_firma END ) = 'VERAG' AND mit_niederlassung = 'SUB' order by name ", False, "ADMIN", True)
        cbxAbteilung.fillWithSQL("SELECT [abt_kuerzel], [abt_bezeichnung] from [tblAbteilungen] ", False, "ADMIN", True,, "")

        cbxGebäude.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Frontoffice", "Frontoffice"))
--- a/Aviso/frmEssensbestellungen.Designer.vb
+++ b/Aviso/frmEssensbestellungen.Designer.vb
@@ -125,7 +125,7 @@ Partial Class frmEssensbestellungen
        'btnSave
        '
        Me.btnSave.Anchor = System.Windows.Forms.AnchorStyles.Bottom
-        Me.btnSave.Location = New System.Drawing.Point(319, 644)
+        Me.btnSave.Location = New System.Drawing.Point(318, 616)
        Me.btnSave.Name = "btnSave"
        Me.btnSave.Size = New System.Drawing.Size(75, 23)
        Me.btnSave.TabIndex = 10
@@ -784,7 +784,7 @@ Partial Class frmEssensbestellungen
        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
        Me.dgvBestellungen.DefaultCellStyle = DataGridViewCellStyle2
-        Me.dgvBestellungen.Location = New System.Drawing.Point(19, 463)
+        Me.dgvBestellungen.Location = New System.Drawing.Point(0, 434)
        Me.dgvBestellungen.Name = "dgvBestellungen"
        Me.dgvBestellungen.ReadOnly = True
        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
@@ -797,7 +797,7 @@ Partial Class frmEssensbestellungen
        Me.dgvBestellungen.RowHeadersDefaultCellStyle = DataGridViewCellStyle3
        Me.dgvBestellungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect
        Me.dgvBestellungen.ShowEditingIcon = False
-        Me.dgvBestellungen.Size = New System.Drawing.Size(660, 165)
+        Me.dgvBestellungen.Size = New System.Drawing.Size(712, 165)
        Me.dgvBestellungen.TabIndex = 2
        '
        'cbxMenu
@@ -932,7 +932,7 @@ Partial Class frmEssensbestellungen
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(712, 677)
+        Me.ClientSize = New System.Drawing.Size(712, 643)
        Me.Controls.Add(Me.txtAnmerkung)
        Me.Controls.Add(Me.Label5)
        Me.Controls.Add(Me.pnlTop)
--- a/Aviso/frmEssensbestellungenAdministration.Designer.vb
+++ b/Aviso/frmEssensbestellungenAdministration.Designer.vb
@@ -23,6 +23,7 @@ Partial Class frmEssensbestellungenAdministration
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmEssensbestellungenAdministration))
        Me.pnlTop = New System.Windows.Forms.Panel()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.Label22 = New System.Windows.Forms.Label()
@@ -715,6 +716,7 @@ Partial Class frmEssensbestellungenAdministration
        Me.Controls.Add(Me.dgvBestellungen)
        Me.Controls.Add(Me.Panel1)
        Me.Controls.Add(Me.pnlTop)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
        Me.Name = "frmEssensbestellungenAdministration"
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
        Me.Text = "Essensbestellungen Administration"
--- a/Aviso/frmEssensbestellungenAdministration.resx
+++ b/Aviso/frmEssensbestellungenAdministration.resx
--- a/Aviso/frmWarenorte.Designer.vb
+++ b/Aviso/frmWarenorte.Designer.vb
@@ -23,6 +23,7 @@ Partial Class frmWarenorte
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmWarenorte))
        Me.pnlTop = New System.Windows.Forms.Panel()
        Me.lblWarning = New System.Windows.Forms.Label()
        Me.Label4 = New System.Windows.Forms.Label()
@@ -67,7 +68,7 @@ Partial Class frmWarenorte
        Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top
        Me.pnlTop.Location = New System.Drawing.Point(0, 0)
        Me.pnlTop.Name = "pnlTop"
-        Me.pnlTop.Size = New System.Drawing.Size(549, 48)
+        Me.pnlTop.Size = New System.Drawing.Size(620, 48)
        Me.pnlTop.TabIndex = 2
        '
        'lblWarning
@@ -95,7 +96,7 @@ Partial Class frmWarenorte
        '
        Me.Label3.AutoSize = True
        Me.Label3.ForeColor = System.Drawing.Color.White
-        Me.Label3.Location = New System.Drawing.Point(414, 0)
+        Me.Label3.Location = New System.Drawing.Point(483, 3)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(32, 13)
        Me.Label3.TabIndex = 5
@@ -108,9 +109,9 @@ Partial Class frmWarenorte
        Me.cbxFirma._value = ""
        Me.cbxFirma.DropDownWidth = 150
        Me.cbxFirma.FormattingEnabled = True
-        Me.cbxFirma.Location = New System.Drawing.Point(417, 15)
+        Me.cbxFirma.Location = New System.Drawing.Point(486, 18)
        Me.cbxFirma.Name = "cbxFirma"
-        Me.cbxFirma.Size = New System.Drawing.Size(100, 21)
+        Me.cbxFirma.Size = New System.Drawing.Size(122, 21)
        Me.cbxFirma.TabIndex = 13
        '
        'btnAdd
@@ -118,7 +119,7 @@ Partial Class frmWarenorte
        Me.btnAdd.BackgroundImage = Global.AVISO.My.Resources.Resources.plus
        Me.btnAdd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.btnAdd.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnAdd.Location = New System.Drawing.Point(128, 283)
+        Me.btnAdd.Location = New System.Drawing.Point(196, 283)
        Me.btnAdd.Name = "btnAdd"
        Me.btnAdd.Size = New System.Drawing.Size(24, 20)
        Me.btnAdd.TabIndex = 97
@@ -129,7 +130,7 @@ Partial Class frmWarenorte
        Me.btnDelete.BackgroundImage = Global.AVISO.My.Resources.Resources.del
        Me.btnDelete.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
        Me.btnDelete.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnDelete.Location = New System.Drawing.Point(151, 283)
+        Me.btnDelete.Location = New System.Drawing.Point(219, 283)
        Me.btnDelete.Name = "btnDelete"
        Me.btnDelete.Size = New System.Drawing.Size(24, 20)
        Me.btnDelete.TabIndex = 96
@@ -137,7 +138,7 @@ Partial Class frmWarenorte
        '
        'txtWarenort
        '
-        Me.txtWarenort.Location = New System.Drawing.Point(19, 25)
+        Me.txtWarenort.Location = New System.Drawing.Point(12, 25)
        Me.txtWarenort.Name = "txtWarenort"
        Me.txtWarenort.Size = New System.Drawing.Size(100, 20)
        Me.txtWarenort.TabIndex = 0
@@ -145,7 +146,7 @@ Partial Class frmWarenorte
        'Label1
        '
        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(16, 9)
+        Me.Label1.Location = New System.Drawing.Point(9, 9)
        Me.Label1.Name = "Label1"
        Me.Label1.Size = New System.Drawing.Size(51, 13)
        Me.Label1.TabIndex = 1
@@ -154,7 +155,7 @@ Partial Class frmWarenorte
        'Label2
        '
        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(137, 9)
+        Me.Label2.Location = New System.Drawing.Point(126, 9)
        Me.Label2.Name = "Label2"
        Me.Label2.Size = New System.Drawing.Size(69, 13)
        Me.Label2.TabIndex = 3
@@ -162,7 +163,7 @@ Partial Class frmWarenorte
        '
        'txtBezeichnung
        '
-        Me.txtBezeichnung.Location = New System.Drawing.Point(140, 25)
+        Me.txtBezeichnung.Location = New System.Drawing.Point(129, 25)
        Me.txtBezeichnung.Name = "txtBezeichnung"
        Me.txtBezeichnung.Size = New System.Drawing.Size(100, 20)
        Me.txtBezeichnung.TabIndex = 2
@@ -170,7 +171,7 @@ Partial Class frmWarenorte
        'Label5
        '
        Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(137, 59)
+        Me.Label5.Location = New System.Drawing.Point(126, 59)
        Me.Label5.Name = "Label5"
        Me.Label5.Size = New System.Drawing.Size(21, 13)
        Me.Label5.TabIndex = 7
@@ -178,7 +179,7 @@ Partial Class frmWarenorte
        '
        'txtOrt
        '
-        Me.txtOrt.Location = New System.Drawing.Point(140, 75)
+        Me.txtOrt.Location = New System.Drawing.Point(129, 75)
        Me.txtOrt.Name = "txtOrt"
        Me.txtOrt.Size = New System.Drawing.Size(100, 20)
        Me.txtOrt.TabIndex = 5
@@ -186,7 +187,7 @@ Partial Class frmWarenorte
        'Label6
        '
        Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(262, 114)
+        Me.Label6.Location = New System.Drawing.Point(246, 114)
        Me.Label6.Name = "Label6"
        Me.Label6.Size = New System.Drawing.Size(65, 13)
        Me.Label6.TabIndex = 9
@@ -195,7 +196,7 @@ Partial Class frmWarenorte
        'Label7
        '
        Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(137, 114)
+        Me.Label7.Location = New System.Drawing.Point(126, 114)
        Me.Label7.Name = "Label7"
        Me.Label7.Size = New System.Drawing.Size(46, 13)
        Me.Label7.TabIndex = 11
@@ -203,7 +204,7 @@ Partial Class frmWarenorte
        '
        'txtKennr
        '
-        Me.txtKennr.Location = New System.Drawing.Point(140, 130)
+        Me.txtKennr.Location = New System.Drawing.Point(129, 130)
        Me.txtKennr.Name = "txtKennr"
        Me.txtKennr.Size = New System.Drawing.Size(100, 20)
        Me.txtKennr.TabIndex = 8
@@ -211,7 +212,7 @@ Partial Class frmWarenorte
        'cbxAktiv
        '
        Me.cbxAktiv.AutoSize = True
-        Me.cbxAktiv.Location = New System.Drawing.Point(268, 9)
+        Me.cbxAktiv.Location = New System.Drawing.Point(252, 9)
        Me.cbxAktiv.Name = "cbxAktiv"
        Me.cbxAktiv.Size = New System.Drawing.Size(50, 17)
        Me.cbxAktiv.TabIndex = 3
@@ -221,7 +222,7 @@ Partial Class frmWarenorte
        'Label8
        '
        Me.Label8.AutoSize = True
-        Me.Label8.Location = New System.Drawing.Point(265, 59)
+        Me.Label8.Location = New System.Drawing.Point(249, 59)
        Me.Label8.Name = "Label8"
        Me.Label8.Size = New System.Drawing.Size(39, 13)
        Me.Label8.TabIndex = 16
@@ -229,7 +230,7 @@ Partial Class frmWarenorte
        '
        'txtCluster
        '
-        Me.txtCluster.Location = New System.Drawing.Point(268, 75)
+        Me.txtCluster.Location = New System.Drawing.Point(252, 75)
        Me.txtCluster.Name = "txtCluster"
        Me.txtCluster.Size = New System.Drawing.Size(100, 20)
        Me.txtCluster.TabIndex = 6
@@ -256,14 +257,14 @@ Partial Class frmWarenorte
        Me.mainPanel.Controls.Add(Me.Label5)
        Me.mainPanel.Controls.Add(Me.txtKennr)
        Me.mainPanel.Controls.Add(Me.Label6)
-        Me.mainPanel.Location = New System.Drawing.Point(181, 55)
+        Me.mainPanel.Location = New System.Drawing.Point(249, 54)
        Me.mainPanel.Name = "mainPanel"
-        Me.mainPanel.Size = New System.Drawing.Size(368, 242)
+        Me.mainPanel.Size = New System.Drawing.Size(359, 248)
        Me.mainPanel.TabIndex = 17
        '
        'txtStrasse
        '
-        Me.txtStrasse.Location = New System.Drawing.Point(19, 75)
+        Me.txtStrasse.Location = New System.Drawing.Point(12, 75)
        Me.txtStrasse.Name = "txtStrasse"
        Me.txtStrasse.Size = New System.Drawing.Size(100, 20)
        Me.txtStrasse.TabIndex = 4
@@ -271,7 +272,7 @@ Partial Class frmWarenorte
        'Label10
        '
        Me.Label10.AutoSize = True
-        Me.Label10.Location = New System.Drawing.Point(16, 59)
+        Me.Label10.Location = New System.Drawing.Point(9, 59)
        Me.Label10.Name = "Label10"
        Me.Label10.Size = New System.Drawing.Size(42, 13)
        Me.Label10.TabIndex = 23
@@ -285,7 +286,7 @@ Partial Class frmWarenorte
        Me.cbxFirmaChange.DropDownWidth = 120
        Me.cbxFirmaChange.Enabled = False
        Me.cbxFirmaChange.FormattingEnabled = True
-        Me.cbxFirmaChange.Location = New System.Drawing.Point(19, 175)
+        Me.cbxFirmaChange.Location = New System.Drawing.Point(12, 175)
        Me.cbxFirmaChange.Name = "cbxFirmaChange"
        Me.cbxFirmaChange.Size = New System.Drawing.Size(100, 21)
        Me.cbxFirmaChange.TabIndex = 21
@@ -294,7 +295,7 @@ Partial Class frmWarenorte
        'Label
        '
        Me.Label.AutoSize = True
-        Me.Label.Location = New System.Drawing.Point(16, 159)
+        Me.Label.Location = New System.Drawing.Point(9, 159)
        Me.Label.Name = "Label"
        Me.Label.Size = New System.Drawing.Size(32, 13)
        Me.Label.TabIndex = 20
@@ -304,7 +305,7 @@ Partial Class frmWarenorte
        'Label9
        '
        Me.Label9.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(16, 114)
+        Me.Label9.Location = New System.Drawing.Point(9, 114)
        Me.Label9.Name = "Label9"
        Me.Label9.Size = New System.Drawing.Size(64, 13)
        Me.Label9.TabIndex = 19
@@ -312,14 +313,14 @@ Partial Class frmWarenorte
        '
        'txtReihenfolge
        '
-        Me.txtReihenfolge.Location = New System.Drawing.Point(19, 130)
+        Me.txtReihenfolge.Location = New System.Drawing.Point(12, 130)
        Me.txtReihenfolge.Name = "txtReihenfolge"
        Me.txtReihenfolge.Size = New System.Drawing.Size(100, 20)
        Me.txtReihenfolge.TabIndex = 7
        '
        'btnSave
        '
-        Me.btnSave.Location = New System.Drawing.Point(281, 207)
+        Me.btnSave.Location = New System.Drawing.Point(281, 219)
        Me.btnSave.Name = "btnSave"
        Me.btnSave.Size = New System.Drawing.Size(75, 23)
        Me.btnSave.TabIndex = 10
@@ -333,7 +334,7 @@ Partial Class frmWarenorte
        Me.cbxGrenzstelle._value = ""
        Me.cbxGrenzstelle.DropDownWidth = 120
        Me.cbxGrenzstelle.FormattingEnabled = True
-        Me.cbxGrenzstelle.Location = New System.Drawing.Point(265, 130)
+        Me.cbxGrenzstelle.Location = New System.Drawing.Point(249, 130)
        Me.cbxGrenzstelle.Name = "cbxGrenzstelle"
        Me.cbxGrenzstelle.Size = New System.Drawing.Size(100, 21)
        Me.cbxGrenzstelle.TabIndex = 9
@@ -347,19 +348,20 @@ Partial Class frmWarenorte
        Me.dgvWarenorteNew.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvWarenorteNew.Location = New System.Drawing.Point(0, 49)
        Me.dgvWarenorteNew.Name = "dgvWarenorteNew"
-        Me.dgvWarenorteNew.Size = New System.Drawing.Size(175, 254)
+        Me.dgvWarenorteNew.Size = New System.Drawing.Size(243, 254)
        Me.dgvWarenorteNew.TabIndex = 98
        '
        'frmWarenorte
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(549, 309)
+        Me.ClientSize = New System.Drawing.Size(620, 309)
        Me.Controls.Add(Me.mainPanel)
        Me.Controls.Add(Me.btnAdd)
        Me.Controls.Add(Me.btnDelete)
        Me.Controls.Add(Me.pnlTop)
        Me.Controls.Add(Me.dgvWarenorteNew)
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
        Me.Name = "frmWarenorte"
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
        Me.Text = "Warenorte"
--- a/Aviso/frmWarenorte.resx
+++ b/Aviso/frmWarenorte.resx
--- a/Aviso/frmWarenorte.vb
+++ b/Aviso/frmWarenorte.vb
@@ -47,7 +47,7 @@ Public Class frmWarenorte
            .Columns("wo_aktiv").Visible = False
            '.Columns("wo_firma").Visible = False
            .Columns("wo_firma").HeaderText = "Firma"
-            .Columns("wo_firma").Width = 100
+            .Columns("wo_firma").Width = 150
        End With