From fd6deec5ca04f06a71d7b6fdf786e1e7a3189fe1 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Wed, 22 Feb 2023 07:58:11 +0100 Subject: [PATCH] Filter Meine Sendungen (ALLE_BACKOFFICE) --- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/frmHauptfenster.Designer.vb | 258 ++++++++++++++++-------------- Aviso/frmHauptfenster.resx | 3 + Aviso/frmHauptfenster.vb | 19 ++- 4 files changed, 156 insertions(+), 128 deletions(-) diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index f29d573..af6220e 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index a15ea5f..6d7a4fd 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -24,15 +24,15 @@ Partial Class frmHauptfenster Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster)) - 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() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + 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 DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem() Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -234,10 +234,10 @@ Partial Class frmHauptfenster Me.btnRg = New System.Windows.Forms.Button() Me.btnKassenbuch = New System.Windows.Forms.Button() Me.btnRefresh = New System.Windows.Forms.Button() - Me.lblDauer = New System.Windows.Forms.Label() Me.Button3 = New System.Windows.Forms.Button() Me.btnKunden = New System.Windows.Forms.Button() Me.btnSpedBuch = New System.Windows.Forms.Button() + Me.lblDauer = New System.Windows.Forms.Label() Me.btnDrucken = New System.Windows.Forms.Button() Me.Button6 = New System.Windows.Forms.Button() Me.Button7 = New System.Windows.Forms.Button() @@ -256,13 +256,13 @@ Partial Class frmHauptfenster Me.lblSuche = New System.Windows.Forms.Label() Me.SplitContainer2 = New System.Windows.Forms.SplitContainer() Me.pnlLinks = New System.Windows.Forms.Panel() + Me.Label20 = New System.Windows.Forms.Label() + Me.picAVISOMessenger = New System.Windows.Forms.PictureBox() + Me.pic = New System.Windows.Forms.PictureBox() Me.Panel2 = New System.Windows.Forms.Panel() Me.Label7 = New System.Windows.Forms.Label() Me.lblErrVermerk = New System.Windows.Forms.Label() Me.lblHinweis = New System.Windows.Forms.Label() - Me.Label20 = New System.Windows.Forms.Label() - Me.picAVISOMessenger = New System.Windows.Forms.PictureBox() - Me.pic = New System.Windows.Forms.PictureBox() Me.pnlLinksOben = New System.Windows.Forms.Panel() Me.Label22 = New System.Windows.Forms.Label() Me.Button12 = New System.Windows.Forms.Button() @@ -371,6 +371,7 @@ Partial Class frmHauptfenster Me.btnMitarbeiterKonto = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen() + Me.lblUsrname = New System.Windows.Forms.Label() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.pnlDetailsRechts.SuspendLayout() @@ -380,9 +381,9 @@ Partial Class frmHauptfenster Me.SplitContainer2.Panel2.SuspendLayout() Me.SplitContainer2.SuspendLayout() Me.pnlLinks.SuspendLayout() - Me.Panel2.SuspendLayout() CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.pic, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel2.SuspendLayout() Me.pnlLinksOben.SuspendLayout() Me.cntxtAtilla.SuspendLayout() CType(Me.SplitContainer3, System.ComponentModel.ISupportInitialize).BeginInit() @@ -1628,6 +1629,7 @@ Partial Class frmHauptfenster 'Top ' Me.Top.BackColor = System.Drawing.Color.White + Me.Top.Controls.Add(Me.lblUsrname) Me.Top.Controls.Add(Me.lblFimaAviso) Me.Top.Controls.Add(Me.Button11) Me.Top.Controls.Add(Me.btnMAVerzeichnis) @@ -1851,18 +1853,6 @@ Partial Class frmHauptfenster Me.btnRefresh.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnRefresh.UseVisualStyleBackColor = True ' - 'lblDauer - ' - Me.lblDauer.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.lblDauer.BackColor = System.Drawing.Color.Transparent - Me.lblDauer.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.lblDauer.Location = New System.Drawing.Point(-2, 195) - Me.lblDauer.Name = "lblDauer" - Me.lblDauer.Size = New System.Drawing.Size(155, 17) - Me.lblDauer.TabIndex = 2 - Me.lblDauer.Text = "1111123 ms" - Me.lblDauer.TextAlign = System.Drawing.ContentAlignment.MiddleLeft - ' 'Button3 ' Me.Button3.Location = New System.Drawing.Point(642, 14) @@ -1905,6 +1895,18 @@ Partial Class frmHauptfenster Me.btnSpedBuch.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnSpedBuch.UseVisualStyleBackColor = True ' + 'lblDauer + ' + Me.lblDauer.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.lblDauer.BackColor = System.Drawing.Color.Transparent + Me.lblDauer.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.lblDauer.Location = New System.Drawing.Point(-2, 195) + Me.lblDauer.Name = "lblDauer" + Me.lblDauer.Size = New System.Drawing.Size(155, 17) + Me.lblDauer.TabIndex = 2 + Me.lblDauer.Text = "1111123 ms" + Me.lblDauer.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' 'btnDrucken ' Me.btnDrucken.Cursor = System.Windows.Forms.Cursors.Default @@ -2125,6 +2127,44 @@ Partial Class frmHauptfenster Me.pnlLinks.Size = New System.Drawing.Size(164, 214) Me.pnlLinks.TabIndex = 0 ' + 'Label20 + ' + Me.Label20.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.Label20.BackColor = System.Drawing.Color.Red + Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label20.ForeColor = System.Drawing.Color.White + Me.Label20.Location = New System.Drawing.Point(49, 167) + Me.Label20.Name = "Label20" + Me.Label20.Size = New System.Drawing.Size(28, 19) + Me.Label20.TabIndex = 9 + Me.Label20.Text = "99" + Me.Label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.Label20.Visible = False + ' + 'picAVISOMessenger + ' + Me.picAVISOMessenger.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.picAVISOMessenger.BackgroundImage = Global.AVISO.My.Resources.Resources.aviso_messenger + Me.picAVISOMessenger.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.picAVISOMessenger.Cursor = System.Windows.Forms.Cursors.Hand + Me.picAVISOMessenger.Location = New System.Drawing.Point(1, 119) + Me.picAVISOMessenger.Name = "picAVISOMessenger" + Me.picAVISOMessenger.Size = New System.Drawing.Size(59, 55) + Me.picAVISOMessenger.TabIndex = 7 + Me.picAVISOMessenger.TabStop = False + Me.picAVISOMessenger.Visible = False + ' + 'pic + ' + Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.disconnect + Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.pic.Location = New System.Drawing.Point(69, 124) + Me.pic.Name = "pic" + Me.pic.Size = New System.Drawing.Size(59, 50) + Me.pic.TabIndex = 5 + Me.pic.TabStop = False + Me.pic.Visible = False + ' 'Panel2 ' Me.Panel2.Controls.Add(Me.Label7) @@ -2174,44 +2214,6 @@ Partial Class frmHauptfenster Me.lblHinweis.Text = "Hinweis eingetragen" Me.lblHinweis.Visible = False ' - 'Label20 - ' - Me.Label20.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.Label20.BackColor = System.Drawing.Color.Red - Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label20.ForeColor = System.Drawing.Color.White - Me.Label20.Location = New System.Drawing.Point(49, 167) - Me.Label20.Name = "Label20" - Me.Label20.Size = New System.Drawing.Size(28, 19) - Me.Label20.TabIndex = 9 - Me.Label20.Text = "99" - Me.Label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.Label20.Visible = False - ' - 'picAVISOMessenger - ' - Me.picAVISOMessenger.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.picAVISOMessenger.BackgroundImage = Global.AVISO.My.Resources.Resources.aviso_messenger - Me.picAVISOMessenger.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.picAVISOMessenger.Cursor = System.Windows.Forms.Cursors.Hand - Me.picAVISOMessenger.Location = New System.Drawing.Point(1, 119) - Me.picAVISOMessenger.Name = "picAVISOMessenger" - Me.picAVISOMessenger.Size = New System.Drawing.Size(59, 55) - Me.picAVISOMessenger.TabIndex = 7 - Me.picAVISOMessenger.TabStop = False - Me.picAVISOMessenger.Visible = False - ' - 'pic - ' - Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.disconnect - Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.pic.Location = New System.Drawing.Point(69, 124) - Me.pic.Name = "pic" - Me.pic.Size = New System.Drawing.Size(59, 50) - Me.pic.TabIndex = 5 - Me.pic.TabStop = False - Me.pic.Visible = False - ' 'pnlLinksOben ' Me.pnlLinksOben.Controls.Add(Me.Label22) @@ -2331,38 +2333,38 @@ Partial Class frmHauptfenster Me.gridMyAviso.AllowUserToDeleteRows = False Me.gridMyAviso.AllowUserToOrderColumns = True Me.gridMyAviso.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure - Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle10.BackColor = System.Drawing.Color.Azure + Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11 Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle12 Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill Me.gridMyAviso.Location = New System.Drawing.Point(0, 21) Me.gridMyAviso.Name = "gridMyAviso" Me.gridMyAviso.ReadOnly = True - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle13 Me.gridMyAviso.RowHeadersVisible = False Me.gridMyAviso.RowHeadersWidth = 62 Me.gridMyAviso.Size = New System.Drawing.Size(488, 279) @@ -2761,47 +2763,47 @@ Partial Class frmHauptfenster Me.gridAviso.AllowUserToAddRows = False Me.gridAviso.AllowUserToDeleteRows = False Me.gridAviso.AllowUserToResizeRows = False - DataGridViewCellStyle5.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle14.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle6.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle15.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle15.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 Me.gridAviso.ColumnHeadersHeight = 25 Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle16 Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill Me.gridAviso.Location = New System.Drawing.Point(0, 220) Me.gridAviso.MultiSelect = False Me.gridAviso.Name = "gridAviso" Me.gridAviso.ReadOnly = True - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle17 Me.gridAviso.RowHeadersVisible = False Me.gridAviso.RowHeadersWidth = 62 Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle18 Me.gridAviso.RowTemplate.ReadOnly = True Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -3539,6 +3541,19 @@ Partial Class frmHauptfenster Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(158, 300) Me.UsrCntlBenachrichtigungen1.TabIndex = 0 ' + 'lblUsrname + ' + Me.lblUsrname.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblUsrname.BackColor = System.Drawing.Color.White + Me.lblUsrname.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.lblUsrname.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) + Me.lblUsrname.Location = New System.Drawing.Point(1252, 34) + Me.lblUsrname.Name = "lblUsrname" + Me.lblUsrname.Size = New System.Drawing.Size(75, 13) + Me.lblUsrname.TabIndex = 86 + Me.lblUsrname.Text = "ADMIN" + Me.lblUsrname.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' 'frmHauptfenster ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3571,10 +3586,10 @@ Partial Class frmHauptfenster CType(Me.SplitContainer2, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer2.ResumeLayout(False) Me.pnlLinks.ResumeLayout(False) - Me.Panel2.ResumeLayout(False) - Me.Panel2.PerformLayout() CType(Me.picAVISOMessenger, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.pic, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel2.ResumeLayout(False) + Me.Panel2.PerformLayout() Me.pnlLinksOben.ResumeLayout(False) Me.cntxtAtilla.ResumeLayout(False) Me.SplitContainer3.Panel1.ResumeLayout(False) @@ -3949,4 +3964,5 @@ Partial Class frmHauptfenster Friend WithEvents AdministrationEssensbestellungenToolStripMenuItem As ToolStripMenuItem Friend WithEvents WarenorteToolStripMenuItem As ToolStripMenuItem Friend WithEvents btnMitarbeiterKonto As VERAG_PROG_ALLGEMEIN.FlatButton + Friend WithEvents lblUsrname As Label End Class diff --git a/Aviso/frmHauptfenster.resx b/Aviso/frmHauptfenster.resx index 1b1c7ab..0a40422 100644 --- a/Aviso/frmHauptfenster.resx +++ b/Aviso/frmHauptfenster.resx @@ -228,6 +228,9 @@ pOTzPwAAAABJRU5ErkJggg== + + 598, 17 + 697, 17 diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index bd93d9f..7fa18cc 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -241,10 +241,17 @@ Public Class frmHauptfenster If VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG Then cboMy_Grenzstelle.Items.Clear() cboMy_Grenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where grz_Grenzstelle='" & VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT & "' AND grz_Firma='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", False) + cboMy_Grenzstelle.changeItem("") Else cboMy_Grenzstelle.Items.Clear() - cboMy_Grenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where ([grz_Firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "') AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True,, "ALLE") + If Not VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Then ' Nicht, wenn Front-Office + cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE (BACKOFFICE)", "ALLE_BACK")) + End If + + cboMy_Grenzstelle.fillWithSQL("SELECT [grz_Grenzstelle],[grz_BezeichnungCBO] FROM tblGrenzstelle where ([grz_Firma]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' OR grz_Cluster='" & VERAG_PROG_ALLGEMEIN.cAllgemein.CLUSTER & "') AND grz_Aktiv=1 order by grz_Reihenfolge, grz_Grenzstelle", False, "AVISO", True, False, "ALLE") cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("??? - Andere", "???")) + cboMy_Grenzstelle.changeItem("") + cboMy_Grenzstelle.changeItem("ALLE_BACK") 'greift nur wenn verfügbar.. End If @@ -259,7 +266,6 @@ Public Class frmHauptfenster 'cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("WO: GE TRANSPORT", "WO_GE")) ''cboGrenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("WO: KITA", "WO_KITA")) 'cboMy_Grenzstelle.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("???", "???")) - cboMy_Grenzstelle.changeItem("") cboMyAvisoAnzeige.Items.Clear() cboMyAvisoAnzeige.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ALLE", "ALLE")) @@ -467,10 +473,12 @@ Public Class frmHauptfenster If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("Avisodaten_verwalten", Me) Then lblMitarbeiter.Text += " (" & VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME & ")" End If + If VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AvisoTV_verwalten", Me) Then AvisoTVToolStripMenuItem.Visible = True End If + lblUsrname.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.USRKURZNAME lblGrenzstelle.Text = VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG.Trim chkFarben = True @@ -1199,7 +1207,8 @@ Public Class frmHauptfenster " FROM Aviso " & " WHERE ( Status IN (0, 3, 4, 5,6,7) OR ( Status = 1 AND [Abgeschlossen] = 0 )) " & sqlStrFirma & " AND (LetzterMitarbeiterId=@maId) " - If cboMy_Grenzstelle._value <> "" Then sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'" + If cboMy_Grenzstelle._value.Replace("ALLE_BACK", "") <> "" Then sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'" + sqlStr &= " ORDER BY case " & " when [Status] =3 then 0 " & @@ -1247,8 +1256,8 @@ Public Class frmHauptfenster Case CheckState.Unchecked : sqlStr &= " AND tblSnd_Vorbereitet is null " ' Case CheckState.Indeterminate : sqlStr &= " AND tblSnd_Vorbereitet is not null " End Select - If cboMy_Grenzstelle._value <> "" Then sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'" - + If cboMy_Grenzstelle._value.Replace("ALLE_BACK", "") <> "" Then sqlStr &= " AND Grenzstelle = '" & cboMy_Grenzstelle._value & "'" + If cboMy_Grenzstelle._value = "ALLE_BACK" Then sqlStr &= " AND FilialenNr NOT IN ('7001','7002','7003') " 'Farbe If VERAG_PROG_ALLGEMEIN.cAllgemein.PARAMS.GET_PARAMETER_VALUE_BOOL("AVISO_MeineSND_Farbe") Then