From ed86d298ae5a6eba12058cb6f8ee8f8dcf54afbb Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Fri, 27 Sep 2024 15:59:35 +0200 Subject: [PATCH] =?UTF-8?q?Gesamtsicherheiten=20AMBAR;=20Berechtigungssteu?= =?UTF-8?q?erung=20ge=C3=A4ndert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aviso/frmGesamtsicherheitenMenuNEU.vb | 1 + Aviso/frmHauptfenster.Designer.vb | 163 ++++++++++++++------------ Aviso/frmHauptfenster.resx | 3 + Aviso/frmHauptfenster.vb | 85 +++++++++----- Aviso/frmSendungsdetailsNEU.vb | 3 +- 5 files changed, 145 insertions(+), 110 deletions(-) diff --git a/Aviso/frmGesamtsicherheitenMenuNEU.vb b/Aviso/frmGesamtsicherheitenMenuNEU.vb index f9397ad..74f5d10 100644 --- a/Aviso/frmGesamtsicherheitenMenuNEU.vb +++ b/Aviso/frmGesamtsicherheitenMenuNEU.vb @@ -29,6 +29,7 @@ Public Class frmGesamtsicherheitenMenuNEU Case "IMEX" : firmaId = 20 : chkOffen.Checked = False Case "Verag CS" : firmaId = 11 : chkOffen.Checked = False Case "Unisped GmbH" : firmaId = 21 : chkOffen.Checked = False + Case "AMBAR GmbH" : firmaId = 24 : chkOffen.Checked = False End Select diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index 11603bd..bb7526a 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) @@ -76,6 +76,7 @@ Partial Class frmHauptfenster Me.AlleStatusMailsSchickenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.RoutenverwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AnhangsartenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.SpireLizenzPrüfenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() Me.FirmaWechselnToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.VERAGToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -124,6 +125,7 @@ Partial Class frmHauptfenster Me.ATVeragCSToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DEVeragGmbHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ATUnispedGmbHToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.DEAmbarToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem10 = New System.Windows.Forms.ToolStripMenuItem() Me.TICKETWaidhausToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator() @@ -397,7 +399,6 @@ Partial Class frmHauptfenster Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() - Me.SpireLizenzPrüfenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.pnlDetailsRechts.SuspendLayout() @@ -713,6 +714,12 @@ Partial Class frmHauptfenster Me.AnhangsartenToolStripMenuItem.Size = New System.Drawing.Size(209, 22) Me.AnhangsartenToolStripMenuItem.Text = "Anhangsarten" ' + 'SpireLizenzPrüfenToolStripMenuItem + ' + Me.SpireLizenzPrüfenToolStripMenuItem.Name = "SpireLizenzPrüfenToolStripMenuItem" + Me.SpireLizenzPrüfenToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.SpireLizenzPrüfenToolStripMenuItem.Text = "Spire-Lizenz prüfen" + ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" @@ -980,7 +987,7 @@ Partial Class frmHauptfenster ' 'GesamtsicherheitenToolStripMenuItem ' - Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem}) + Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem, Me.DEAmbarToolStripMenuItem}) Me.GesamtsicherheitenToolStripMenuItem.Name = "GesamtsicherheitenToolStripMenuItem" Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) Me.GesamtsicherheitenToolStripMenuItem.Text = "Gesamtsicherheiten" @@ -989,33 +996,40 @@ Partial Class frmHauptfenster 'ATVeragAGToolStripMenuItem ' Me.ATVeragAGToolStripMenuItem.Name = "ATVeragAGToolStripMenuItem" - Me.ATVeragAGToolStripMenuItem.Size = New System.Drawing.Size(178, 22) + Me.ATVeragAGToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.ATVeragAGToolStripMenuItem.Text = "AT | Verag AG" ' 'ATImexCSToolStripMenuItem ' Me.ATImexCSToolStripMenuItem.Name = "ATImexCSToolStripMenuItem" - Me.ATImexCSToolStripMenuItem.Size = New System.Drawing.Size(178, 22) + Me.ATImexCSToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.ATImexCSToolStripMenuItem.Text = "AT | IMEX CS GmbH" ' 'ATVeragCSToolStripMenuItem ' Me.ATVeragCSToolStripMenuItem.Name = "ATVeragCSToolStripMenuItem" - Me.ATVeragCSToolStripMenuItem.Size = New System.Drawing.Size(178, 22) + Me.ATVeragCSToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.ATVeragCSToolStripMenuItem.Text = "AT | Verag CS" ' 'DEVeragGmbHToolStripMenuItem ' Me.DEVeragGmbHToolStripMenuItem.Name = "DEVeragGmbHToolStripMenuItem" - Me.DEVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(178, 22) + Me.DEVeragGmbHToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.DEVeragGmbHToolStripMenuItem.Text = "DE | Verag GmbH" ' 'ATUnispedGmbHToolStripMenuItem ' Me.ATUnispedGmbHToolStripMenuItem.Name = "ATUnispedGmbHToolStripMenuItem" - Me.ATUnispedGmbHToolStripMenuItem.Size = New System.Drawing.Size(178, 22) + Me.ATUnispedGmbHToolStripMenuItem.Size = New System.Drawing.Size(180, 22) Me.ATUnispedGmbHToolStripMenuItem.Text = "AT | Unisped GmbH" ' + 'DEAmbarToolStripMenuItem + ' + Me.DEAmbarToolStripMenuItem.Name = "DEAmbarToolStripMenuItem" + Me.DEAmbarToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.DEAmbarToolStripMenuItem.Text = "DE | Ambar GmbH" + Me.DEAmbarToolStripMenuItem.Visible = False + ' 'ToolStripMenuItem10 ' Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10" @@ -2521,38 +2535,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) @@ -2965,47 +2979,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, 248) 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 @@ -3779,12 +3793,6 @@ Partial Class frmHauptfenster Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) Me.UsrCntlTestsystem1.TabIndex = 8 ' - 'SpireLizenzPrüfenToolStripMenuItem - ' - Me.SpireLizenzPrüfenToolStripMenuItem.Name = "SpireLizenzPrüfenToolStripMenuItem" - Me.SpireLizenzPrüfenToolStripMenuItem.Size = New System.Drawing.Size(209, 22) - Me.SpireLizenzPrüfenToolStripMenuItem.Text = "Spire-Lizenz prüfen" - ' 'frmHauptfenster ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -4223,4 +4231,5 @@ Partial Class frmHauptfenster Friend WithEvents EMAILToolStripMenuItem As ToolStripMenuItem Friend WithEvents FTPToolStripMenuItem As ToolStripMenuItem Friend WithEvents SpireLizenzPrüfenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents DEAmbarToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmHauptfenster.resx b/Aviso/frmHauptfenster.resx index b95b36c..9801068 100644 --- a/Aviso/frmHauptfenster.resx +++ b/Aviso/frmHauptfenster.resx @@ -243,6 +243,9 @@ pOTzPwAAAABJRU5ErkJggg== + + 560, 17 + 659, 17 diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 34cb941..84c1b38 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -2,21 +2,13 @@ Imports System.IO Imports VERAG_PROG_ALLGEMEIN Imports VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO - Imports VERAG_PROG_ALLGEMEIN.cGlobal -'Imports Gemeinsames.cDatenbank -Imports System.Drawing -'Imports SDL -Imports Hardcodet.Wpf.TaskbarNotification Imports com.esendex.sdk.messaging Imports Newtonsoft.Json Imports System.Reflection -Imports System.Runtime.InteropServices -Imports GrapeCity.Viewer.Common.Model Imports System.Drawing.Drawing2D Imports SDL Imports Microsoft.Office.Interop -Imports Spire.Pdf.Print Imports Spire.Pdf.Texts @@ -652,6 +644,8 @@ Public Class frmHauptfenster Label22.BringToFront() End If End Sub + + Public Sub setAktDetails(id, showSendungsdetails) Details_anzeigen(id) ', showSendungsdetails) End Sub @@ -2779,33 +2773,13 @@ Public Class frmHauptfenster btnWichtigeStandort.Visible = False Panel2.Visible = False - ' Label4.Visible = False '- -> NICHT MEHR - ' cboGrenzstelle.Visible = Falsee '- -> NICHT MEHR - 'BürgschaftenExcelToolStripMenuItem.Visible = True - ATVeragCSToolStripMenuItem.Visible = True - 'ToolStripMenuItem4.Visible = True - DEVeragGmbHToolStripMenuItem.Visible = True - 'ToolStripMenuItem5.Visible = True - ATVeragAGToolStripMenuItem.Visible = True + ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then 'nix ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then - 'btnGenerelleGestellungen.Visible = False - 'ToolStripMenuItem4.Visible = True - DEVeragGmbHToolStripMenuItem.Visible = True - 'ToolStripMenuItem5.Visible = True - 'ATVeragAGToolStripMenuItem.Visible = True - 'ToolStripMenuItem6.Visible = True - ATImexCSToolStripMenuItem.Visible = True + 'nix Else 'VERAG - 'BürgschaftenExcelToolStripMenuItem.Visible = True - ATVeragCSToolStripMenuItem.Visible = True - 'ToolStripMenuItem4.Visible = True - DEVeragGmbHToolStripMenuItem.Visible = True - 'ToolStripMenuItem5.Visible = True - ATVeragAGToolStripMenuItem.Visible = True - 'ToolStripMenuItem6.Visible = True - ATImexCSToolStripMenuItem.Visible = True + If VERAG_PROG_ALLGEMEIN.cAllgemein.NIEDERLASSUNG = "WAI" Then Button5.Visible = True End If @@ -2869,6 +2843,8 @@ Public Class frmHauptfenster BürgschaftenExcelToolStripMenuItem.Visible = False + setGesamtsicherheitenBerechtigung() + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA IsNot "VERIMEX" And VERAG_PROG_ALLGEMEIN.cAllgemein.WARENORT_ZUGANG = False Then @@ -2895,6 +2871,48 @@ Public Class frmHauptfenster timerStart.Enabled = False End Sub + Private Sub setGesamtsicherheitenBerechtigung() + + ATVeragCSToolStripMenuItem.Visible = False + DEVeragGmbHToolStripMenuItem.Visible = False + ATVeragAGToolStripMenuItem.Visible = False + ATImexCSToolStripMenuItem.Visible = False + DEAmbarToolStripMenuItem.Visible = False + ATUnispedGmbHToolStripMenuItem.Visible = False + + + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "ATILLA" Then + ATVeragCSToolStripMenuItem.Visible = True + DEVeragGmbHToolStripMenuItem.Visible = True + ATVeragAGToolStripMenuItem.Visible = True + ATUnispedGmbHToolStripMenuItem.Visible = True + ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "VERIMEX" Then + 'nix + ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "IMEX" Then + DEVeragGmbHToolStripMenuItem.Visible = True + ATVeragCSToolStripMenuItem.Visible = True + ATVeragAGToolStripMenuItem.Visible = True + ATImexCSToolStripMenuItem.Visible = True + ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "AMBAR" Then + DEAmbarToolStripMenuItem.Visible = True + ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "UNISPED" Then + ATUnispedGmbHToolStripMenuItem.Visible = True + + ElseIf VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA = "FRONTOFFICE" Then + ATVeragCSToolStripMenuItem.Visible = True + ATVeragAGToolStripMenuItem.Visible = True + ATImexCSToolStripMenuItem.Visible = True + Else + 'VERAG + ATVeragCSToolStripMenuItem.Visible = True + DEVeragGmbHToolStripMenuItem.Visible = True + ATVeragAGToolStripMenuItem.Visible = True + ATImexCSToolStripMenuItem.Visible = True + + End If + + + End Sub Private Sub frmMain_SizeChanged(sender As Object, e As EventArgs) Handles MyBase.SizeChanged If Me.WindowState = FormWindowState.Minimized Then Exit Sub @@ -4357,7 +4375,7 @@ Public Class frmHauptfenster Process.Start("https://www.ros.ie/customs-roro-control-web/ros/pbn/create") End Sub - Private Sub ATGesamtsicherheitVeragAGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATVeragAGToolStripMenuItem.Click, DEVeragGmbHToolStripMenuItem.Click, ATImexCSToolStripMenuItem.Click, ATVeragCSToolStripMenuItem.Click, ATUnispedGmbHToolStripMenuItem.Click + Private Sub ATGesamtsicherheitVeragAGToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ATVeragAGToolStripMenuItem.Click, DEVeragGmbHToolStripMenuItem.Click, ATImexCSToolStripMenuItem.Click, ATVeragCSToolStripMenuItem.Click, ATUnispedGmbHToolStripMenuItem.Click, DEAmbarToolStripMenuItem.Click Dim frm As New frmGesamtsicherheitenMenuNEU() Select Case sender.name @@ -4366,6 +4384,7 @@ Public Class frmHauptfenster Case "ATImexCSToolStripMenuItem" : frm.Standort = "IMEX" Case "ATVeragCSToolStripMenuItem" : frm.Standort = "Verag CS" Case "ATUnispedGmbHToolStripMenuItem" : frm.Standort = "Unisped GmbH" + Case "DEAmbarToolStripMenuItem" : frm.Standort = "AMBAR GmbH" End Select frm.Show() @@ -4719,6 +4738,8 @@ Public Class frmHauptfenster End If End Sub + + End Class Public Class AvisoStatusFunctions diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index eda58ed..20d1e8f 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -5398,11 +5398,12 @@ Public Class frmSendungsdetailsNEU Dim ANH_LIST_SND As New List(Of VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge) VERAG_PROG_ALLGEMEIN.cAvisoAnhaenge.LOAD_LIST_BySendung(ANH_LIST_SND, SENDUNG.tblSnd_SendungID) 'LÄDT alle Aviso-Anhänge Dim invoicePrinted As Boolean = False + + If ANH_LIST_SND.Any(Function(c) c.anh_Art.ToString.Contains("RECHNUNG")) Then invoicePrinted = True For Each l In ANH_LIST_SND Select Case l.anh_Art.ToString.ToUpper Case "RECHNUNG", "HANDELSRECHNUNG" VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId)}) - invoicePrinted = True Case "EFATURA", "EUR1" If Not invoicePrinted Then VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF({VERAG_PROG_ALLGEMEIN.cDATENSERVER.GET_PDFPath_BY_DocID(l.anh_docId)})