diff --git a/Aviso/Anhänge/frmSendungAnhangImport.vb b/Aviso/Anhänge/frmSendungAnhangImport.vb index 05c4487..3d513d6 100644 --- a/Aviso/Anhänge/frmSendungAnhangImport.vb +++ b/Aviso/Anhänge/frmSendungAnhangImport.vb @@ -3,6 +3,7 @@ 'Imports iTextSharp.text Imports System.IO Imports Spire.Pdf +Imports VERAG_PROG_ALLGEMEIN 'Imports GrapeCity.Documents.Pdf 'Imports Spire.Pdf @@ -72,7 +73,7 @@ Public Class frmSendungAnhangImport Sub initElement(USRCNTL As usrCntlSendungAnhangElement) AddHandler USRCNTL.ME_CLICK, Sub(STRG_PRESSED) ' If BrowserLoaded Then - + If Not STRG_PRESSED Then @@ -637,11 +638,11 @@ Public Class frmSendungAnhangImport Public Function ExtractPdfPages_NEW(ByVal SourceFile As String, ByVal TargetFile As String, pagesToExtract As List(Of Integer)) As Boolean 'ITEXTSHARP Try - Dim impPage As iTextSharp.text.pdf.PdfImportedPage = Nothing - Dim Reader As New iTextSharp.text.pdf.PdfReader(SourceFile) + Dim impPage As itextsharp.text.pdf.PdfImportedPage = Nothing + Dim Reader As New itextsharp.text.pdf.PdfReader(SourceFile) If Not TargetFile.ToLower.EndsWith(".pdf") Then TargetFile = TargetFile & ".pdf" - Dim srcDoc As New iTextSharp.text.Document() 'Reader.GetPageSizeWithRotation(0)) - Dim PdfCopyProvider As New iTextSharp.text.pdf.PdfCopy(srcDoc, New System.IO.FileStream(TargetFile, System.IO.FileMode.Create)) + Dim srcDoc As New itextsharp.text.Document() 'Reader.GetPageSizeWithRotation(0)) + Dim PdfCopyProvider As New itextsharp.text.pdf.PdfCopy(srcDoc, New System.IO.FileStream(TargetFile, System.IO.FileMode.Create)) PdfCopyProvider.SetFullCompression() srcDoc.Open() For Each p In pagesToExtract @@ -652,7 +653,7 @@ Public Class frmSendungAnhangImport End If impPage = PdfCopyProvider.GetImportedPage(Reader, p) ' ----- Ermitteln der Seitenauflösung und setzen für die neue Seite - PdfCopyProvider.SetPageSize(New iTextSharp.text.Rectangle(0.0F, 0.0F, impPage.Width, impPage.Height, Reader.GetPageRotation(p))) + PdfCopyProvider.SetPageSize(New itextsharp.text.Rectangle(0.0F, 0.0F, impPage.Width, impPage.Height, Reader.GetPageRotation(p))) ' ----- PDF Seite in das neue Dokument einfügen PdfCopyProvider.AddPage(impPage) @@ -888,7 +889,7 @@ Public Class frmSendungAnhangImport Try PagesLeft = 0 - Dim r As iTextSharp.text.pdf.PdfReader = New iTextSharp.text.pdf.PdfReader(sourceFile) + Dim r As itextsharp.text.pdf.PdfReader = New itextsharp.text.pdf.PdfReader(sourceFile) Dim pagesToKeep As New List(Of Integer) For p = 1 To r.NumberOfPages Dim del = False @@ -910,9 +911,9 @@ Public Class frmSendungAnhangImport Using fs As FileStream = New FileStream(destinationFile, FileMode.Create, FileAccess.Write, FileShare.None) - Using doc As iTextSharp.text.Document = New iTextSharp.text.Document() + Using doc As itextsharp.text.Document = New itextsharp.text.Document() - Dim w As iTextSharp.text.pdf.PdfWriter = iTextSharp.text.pdf.PdfWriter.GetInstance(doc, fs) + Dim w As itextsharp.text.pdf.PdfWriter = itextsharp.text.pdf.PdfWriter.GetInstance(doc, fs) doc.Open() For Each page As Integer In pagesToKeep doc.NewPage() @@ -1060,12 +1061,13 @@ Public Class frmSendungAnhangImport flpnlAviso.Controls.Clear() flpnlSendungen.Controls.Clear() + cboArt.Items.Clear() - Dim SQLString = "SELECT [aa_name],[aa_bezeichnung] FROM [tblAvisoAnhangsArten] WHERE aa_aktiv=1 and ((aa_firma is null and aa_filiale is null)" - SQLString &= IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "", " OR aa_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", "") - SQLString &= IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE <> "", " OR aa_filiale = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "'", "") - SQLString &= ")" - cboArt.fillWithSQL(SQLString, False, "AVISO", True) + Dim list As New cAvisoAnhangsarten_LIST(True, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE) + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + For Each r In list.LIST + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(r.aa_name, r.aa_bezeichnung)) + Next 'cboArt.Items.Clear() 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) @@ -1074,8 +1076,7 @@ Public Class frmSendungAnhangImport 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Rechnung", "Rechnung")) 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("eFatura", "eFatura")) 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("CMR", "CMR")) - 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ausfuhr", "Ausfuhr")) - 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Vorpapier", "Vorpapier")) + 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Ausfuhr", "Ausfuhr"))++++++ 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Packliste", "Packliste")) 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Auftrag", "Auftrag")) 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Dispoliste", "Dispoliste")) @@ -1110,11 +1111,6 @@ Public Class frmSendungAnhangImport 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges")) - - - - - cboArt._TRANSLATE() initSendungen() @@ -1141,7 +1137,7 @@ Public Class frmSendungAnhangImport Dim cnt = 1 For Each s In SENDUNG_LIST Dim abfertigungsArt = SQL.getValueTxtBySql("SELECT isnull([Abfertigungsbezeichnung],'') FROM [Abfertigungsarten] WHERE Abfertigungsart='" & s.tblSnd_Abfertigungsart_ID & "'", "FMZOLL") - Dim empfTmp = "" + Dim empfTmp = "" If s.tblSnd_Empfaenger IsNot Nothing Then empfTmp = If(s.tblSnd_Empfaenger.Length > 15, s.tblSnd_Empfaenger.Substring(0, 15), s.tblSnd_Empfaenger) End If diff --git a/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb b/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb index 60c07de..4e079e4 100644 --- a/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb +++ b/Aviso/Anhänge/frmSendungAnhangUmbenennenUmkateg.vb @@ -1,4 +1,6 @@ -Public Class frmSendungAnhangUmbenennenUmkateg +Imports VERAG_PROG_ALLGEMEIN + +Public Class frmSendungAnhangUmbenennenUmkateg Dim nameOLD = "" Dim artOLD = "" Sub New(nameOLD As String, artOLD As String) @@ -13,11 +15,11 @@ Private Sub frmSendungAnhangImport_Load(sender As Object, e As EventArgs) Handles Me.Load cboArt.Items.Clear() - Dim SQLString = "SELECT [aa_name],[aa_bezeichnung] FROM [tblAvisoAnhangsArten] WHERE aa_aktiv=1 and ((aa_firma is null and aa_filiale is null)" - SQLString &= IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA.ToString, " OR aa_firma = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "'", "") - SQLString &= IIf(VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE, " OR filiale = '" & VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE & "'", "") - SQLString &= ")" - cboArt.fillWithSQL(SQLString, False, "AVISO", True) + Dim list As New cAvisoAnhangsarten_LIST(True, VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA, VERAG_PROG_ALLGEMEIN.cAllgemein.STAMMFILIALE) + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) + For Each r In list.LIST + cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem(r.aa_name, r.aa_bezeichnung)) + Next 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("", "")) 'cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATR", "ATR-EUR1")) diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 98715aa..60d1ad8 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -553,6 +553,12 @@ Form + + frmAvisoAnhangsarten.vb + + + Form + frmDigicust.vb @@ -1141,6 +1147,9 @@ frmAvisoBenachrichtigungReminderBestaetigen.vb + + frmAvisoAnhangsarten.vb + frmDigicust.vb diff --git a/Aviso/frmAvisoAnhangsarten.Designer.vb b/Aviso/frmAvisoAnhangsarten.Designer.vb new file mode 100644 index 0000000..fa613a0 --- /dev/null +++ b/Aviso/frmAvisoAnhangsarten.Designer.vb @@ -0,0 +1,88 @@ + _ +Partial Class frmAvisoAnhangsarten + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.DataGridView = New System.Windows.Forms.DataGridView() + Me.btnOK = New System.Windows.Forms.Button() + Me.Label2 = New System.Windows.Forms.Label() + Me.txtSuche = New System.Windows.Forms.TextBox() + CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'DataGridView + ' + Me.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.DataGridView.Location = New System.Drawing.Point(12, 45) + Me.DataGridView.MultiSelect = False + Me.DataGridView.Name = "DataGridView" + Me.DataGridView.Size = New System.Drawing.Size(786, 399) + Me.DataGridView.TabIndex = 15 + ' + 'btnOK + ' + Me.btnOK.Location = New System.Drawing.Point(689, 446) + Me.btnOK.Name = "btnOK" + Me.btnOK.Size = New System.Drawing.Size(109, 23) + Me.btnOK.TabIndex = 16 + Me.btnOK.Text = "Speichern" + Me.btnOK.UseVisualStyleBackColor = True + Me.btnOK.Visible = False + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(9, 3) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(41, 13) + Me.Label2.TabIndex = 17 + Me.Label2.Text = "Suche:" + ' + 'txtSuche + ' + Me.txtSuche.Location = New System.Drawing.Point(12, 19) + Me.txtSuche.Name = "txtSuche" + Me.txtSuche.Size = New System.Drawing.Size(150, 20) + Me.txtSuche.TabIndex = 18 + ' + 'frmAvisoAnhangsarten + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(810, 481) + Me.Controls.Add(Me.Label2) + Me.Controls.Add(Me.txtSuche) + Me.Controls.Add(Me.btnOK) + Me.Controls.Add(Me.DataGridView) + Me.Name = "frmAvisoAnhangsarten" + Me.Text = "frmAvisoAnhangsarten" + CType(Me.DataGridView, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents DataGridView As DataGridView + Friend WithEvents btnOK As Button + Friend WithEvents Label2 As Label + Friend WithEvents txtSuche As TextBox +End Class diff --git a/Aviso/frmAvisoAnhangsarten.resx b/Aviso/frmAvisoAnhangsarten.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Aviso/frmAvisoAnhangsarten.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Aviso/frmAvisoAnhangsarten.vb b/Aviso/frmAvisoAnhangsarten.vb new file mode 100644 index 0000000..c805b89 --- /dev/null +++ b/Aviso/frmAvisoAnhangsarten.vb @@ -0,0 +1,130 @@ +Imports iText.Forms.Xfdf +Imports iText.Kernel.Pdf +Imports System.Web.UI + +Public Class frmAvisoAnhangsarten + + + Dim SPRACHENBind As cEasyBinding + Public table + Public BIND_DB + Private EditRow As Integer = -1 + Sub New(table, BIND_DB) + Me.table = table + Me.BIND_DB = BIND_DB + InitializeComponent() + End Sub + + Private Sub frmSprachen_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + loadDGV() + ' btnOK.Visible = True + + + End Sub + + + + Private Sub loadDGV(Optional sqlwhere As String = "") + + Try + SPRACHENBind = New cEasyBinding(BIND_DB) + + + If sqlwhere = "" Then + + SPRACHENBind.initBinding("SELECT * FROM " & table, table) + Else + + SPRACHENBind.initBinding("SELECT * FROM " & table & " WHERE " & sqlwhere, table) + + End If + + DataGridView.DataSource = SPRACHENBind.bindingdataTable + + With DataGridView + + If .Columns.Count > 0 Then + .Columns("aa_id").Visible = False + .Columns("aa_name").HeaderText = "Name" + .Columns("aa_name").Width = 150 + .Columns("aa_sort").HeaderText = "Sort." + .Columns("aa_sort").Width = 40 + .Columns("aa_isBrexti").HeaderText = "Brexit" + .Columns("aa_isBrexti").Width = 40 + .Columns("aa_aktiv").HeaderText = "Aktiv" + .Columns("aa_aktiv").Width = 40 + .Columns("aa_bezeichnung").HeaderText = "Bezeichnung" + .Columns("aa_bezeichnung").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + .Columns("aa_firma").HeaderText = "nur für Firma" + .Columns("aa_firma").Width = 100 + .Columns("aa_filiale").HeaderText = "nur für Filiale" + .Columns("aa_filiale").Width = 100 + End If + + End With + + + + Catch ex As Exception + MsgBox(ex.Message) + End Try + + End Sub + + Private Sub TextBox1_PreviewKeyDown(sender As Object, e As PreviewKeyDownEventArgs) Handles txtSuche.PreviewKeyDown + + Dim sqladdon As String = "" + + If e.KeyCode = Keys.Enter Then + If txtSuche.Text <> "" Then + sqladdon &= " [aa_name] like '%" & txtSuche.Text & "%' or [aa_bezeichnung] like '%" & txtSuche.Text & "%'" + End If + loadDGV(sqladdon) + End If + + + + End Sub + + + Private Sub DataGridView_DefaultValuesNeeded(sender As Object, e As DataGridViewRowEventArgs) Handles DataGridView.DefaultValuesNeeded + Try + + e.Row.Cells("aa_aktiv").Value = True + + Catch ex As Exception + MsgBox(ex.Message) + End Try + End Sub + + + Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click + + If DataGridView.Columns.Count = 0 Or DataGridView.SelectedRows.Count = 0 Then 'alles gelöscht oder markierte Zeile gelöscht + SPRACHENBind.updateBinding() + Exit Sub + End If + + If DataGridView.CurrentRow.Cells("aa_name").ToString <> "" AndAlso DataGridView.CurrentRow.Cells("aa_sort").ToString <> "" AndAlso DataGridView.CurrentRow.Cells("aa_bezeichnung").ToString <> "" AndAlso EditRow >= 0 Then + SPRACHENBind.updateBinding() + End If + + End Sub + + + Private Sub DataGridView_EditingControlShowing(sender As Object, e As DataGridViewEditingControlShowingEventArgs) Handles DataGridView.EditingControlShowing + EditRow = DataGridView.CurrentRow.Index + End Sub + + Private Sub DataGridView_SelectionChanged(sender As Object, e As EventArgs) Handles DataGridView.SelectionChanged + If EditRow >= 0 Then + Dim new_row As Integer = EditRow + EditRow = -1 + DataGridView.CurrentCell = DataGridView.Rows(new_row).Cells( + DataGridView.CurrentCell.ColumnIndex) + End If + End Sub + + +End Class \ No newline at end of file diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index d6258af..1b73520 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -392,6 +392,7 @@ Partial Class frmHauptfenster Me.cntVerag = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.AnhangsartenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.pnlDetailsRechts.SuspendLayout() @@ -611,7 +612,7 @@ Partial Class frmHauptfenster ' 'AdministrationToolStripMenuItem ' - Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KdNrZuordnenToolStripMenuItem, Me.OptionenToolStripMenuItem1, Me.VorlagenUploadToolStripMenuItem, Me.BarcodeTestToolStripMenuItem, Me.TabellenToolStripMenuItem, Me.SMSTestToolStripMenuItem, Me.QSTeamsToolStripMenuItem, Me.LeereRechnungToolStripMenuItem, Me.EMAILTESTToolStripMenuItem, Me.FreigabeMailTestToolStripMenuItem, Me.SDLProgrammStartenToolStripMenuItem, Me.TESTToolStripMenuItem, Me.AlleStatusMailsSchickenToolStripMenuItem, Me.RoutenverwaltungToolStripMenuItem}) + Me.AdministrationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.KdNrZuordnenToolStripMenuItem, Me.OptionenToolStripMenuItem1, Me.VorlagenUploadToolStripMenuItem, Me.BarcodeTestToolStripMenuItem, Me.TabellenToolStripMenuItem, Me.SMSTestToolStripMenuItem, Me.QSTeamsToolStripMenuItem, Me.LeereRechnungToolStripMenuItem, Me.EMAILTESTToolStripMenuItem, Me.FreigabeMailTestToolStripMenuItem, Me.SDLProgrammStartenToolStripMenuItem, Me.TESTToolStripMenuItem, Me.AlleStatusMailsSchickenToolStripMenuItem, Me.RoutenverwaltungToolStripMenuItem, Me.AnhangsartenToolStripMenuItem}) Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem" Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(213, 22) Me.AdministrationToolStripMenuItem.Text = "Administration" @@ -873,26 +874,26 @@ Partial Class frmHauptfenster 'GenerelleGestellungenDurchsuchenToolStripMenuItem ' Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Name = "GenerelleGestellungenDurchsuchenToolStripMenuItem" - Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Text = "Generelle Gestellungen durchsuchen" Me.GenerelleGestellungenDurchsuchenToolStripMenuItem.Visible = False ' 'KundenVonFremdenSpeditionenToolStripMenuItem ' Me.KundenVonFremdenSpeditionenToolStripMenuItem.Name = "KundenVonFremdenSpeditionenToolStripMenuItem" - Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.KundenVonFremdenSpeditionenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.KundenVonFremdenSpeditionenToolStripMenuItem.Text = "Kunden von fremden Speditionen" ' 'KundenverwaltungToolStripMenuItem ' Me.KundenverwaltungToolStripMenuItem.Name = "KundenverwaltungToolStripMenuItem" - Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.KundenverwaltungToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.KundenverwaltungToolStripMenuItem.Text = "Kundenverwaltung" ' 'MDMParkplatzkartenToolStripMenuItem ' Me.MDMParkplatzkartenToolStripMenuItem.Name = "MDMParkplatzkartenToolStripMenuItem" - Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.MDMParkplatzkartenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.MDMParkplatzkartenToolStripMenuItem.Text = "MDM - Parkplatzkarten" ' 'SMSSendenToolStripMenuItem @@ -900,7 +901,7 @@ Partial Class frmHauptfenster Me.SMSSendenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeueSMSSendenToolStripMenuItem, Me.GesendeteSMSToolStripMenuItem}) Me.SMSSendenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.handy2 Me.SMSSendenToolStripMenuItem.Name = "SMSSendenToolStripMenuItem" - Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.SMSSendenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.SMSSendenToolStripMenuItem.Text = "SMS" ' 'NeueSMSSendenToolStripMenuItem @@ -918,51 +919,51 @@ Partial Class frmHauptfenster 'ZollprogrammeNachEORIDurchsuchenToolStripMenuItem ' Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Name = "ZollprogrammeNachEORIDurchsuchenToolStripMenuItem" - Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem.Text = "Zollprogramme nach EORI durchsuchen" ' 'MRNBarcodedruckToolStripMenuItem ' Me.MRNBarcodedruckToolStripMenuItem.Name = "MRNBarcodedruckToolStripMenuItem" - Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.MRNBarcodedruckToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.MRNBarcodedruckToolStripMenuItem.Text = "MRN Barcodedruck" ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(388, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(380, 6) ' 'tool_BRGXLS ' Me.tool_BRGXLS.Name = "tool_BRGXLS" - Me.tool_BRGXLS.Size = New System.Drawing.Size(391, 30) + Me.tool_BRGXLS.Size = New System.Drawing.Size(383, 22) Me.tool_BRGXLS.Text = "Bürgschaften Excel" ' 'ToolStripMenuItem4 ' Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4" - Me.ToolStripMenuItem4.Size = New System.Drawing.Size(391, 30) + Me.ToolStripMenuItem4.Size = New System.Drawing.Size(383, 22) Me.ToolStripMenuItem4.Text = "DE | Gesamtsicherheit VERAG GmbH - Excel" Me.ToolStripMenuItem4.Visible = False ' 'ToolStripMenuItem5 ' Me.ToolStripMenuItem5.Name = "ToolStripMenuItem5" - Me.ToolStripMenuItem5.Size = New System.Drawing.Size(391, 30) + Me.ToolStripMenuItem5.Size = New System.Drawing.Size(383, 22) Me.ToolStripMenuItem5.Text = "AT | Gesamtsicherheit VERAG AG - Excel" Me.ToolStripMenuItem5.Visible = False ' 'BürgschaftenExcelToolStripMenuItem ' Me.BürgschaftenExcelToolStripMenuItem.Name = "BürgschaftenExcelToolStripMenuItem" - Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.BürgschaftenExcelToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.BürgschaftenExcelToolStripMenuItem.Text = "AT | Gesamtsicherheit VERAG Customs Service - Excel" Me.BürgschaftenExcelToolStripMenuItem.Visible = False ' 'ToolStripMenuItem6 ' Me.ToolStripMenuItem6.Name = "ToolStripMenuItem6" - Me.ToolStripMenuItem6.Size = New System.Drawing.Size(391, 30) + Me.ToolStripMenuItem6.Size = New System.Drawing.Size(383, 22) Me.ToolStripMenuItem6.Text = "AT | Gesamtsicherheit IMEX Customs Service GmbH - Excel" Me.ToolStripMenuItem6.Visible = False ' @@ -970,7 +971,7 @@ Partial Class frmHauptfenster ' Me.GesamtsicherheitenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ATVeragAGToolStripMenuItem, Me.ATImexCSToolStripMenuItem, Me.ATVeragCSToolStripMenuItem, Me.DEVeragGmbHToolStripMenuItem, Me.ATUnispedGmbHToolStripMenuItem}) Me.GesamtsicherheitenToolStripMenuItem.Name = "GesamtsicherheitenToolStripMenuItem" - Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.GesamtsicherheitenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.GesamtsicherheitenToolStripMenuItem.Text = "Gesamtsicherheiten" Me.GesamtsicherheitenToolStripMenuItem.Visible = False ' @@ -1007,25 +1008,25 @@ Partial Class frmHauptfenster 'ToolStripMenuItem10 ' Me.ToolStripMenuItem10.Name = "ToolStripMenuItem10" - Me.ToolStripMenuItem10.Size = New System.Drawing.Size(391, 30) + Me.ToolStripMenuItem10.Size = New System.Drawing.Size(383, 22) Me.ToolStripMenuItem10.Text = "TICKET Parkplatz" ' 'TICKETWaidhausToolStripMenuItem ' Me.TICKETWaidhausToolStripMenuItem.Name = "TICKETWaidhausToolStripMenuItem" - Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.TICKETWaidhausToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.TICKETWaidhausToolStripMenuItem.Text = "Infoschreiben Parkplatz" ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(388, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(380, 6) ' 'DAKOSYToolStripMenuItem ' Me.DAKOSYToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StammreferenzenVerwaltenToolStripMenuItem}) Me.DAKOSYToolStripMenuItem.Name = "DAKOSYToolStripMenuItem" - Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.DAKOSYToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.DAKOSYToolStripMenuItem.Text = "DAKOSY" ' 'StammreferenzenVerwaltenToolStripMenuItem @@ -1037,75 +1038,75 @@ Partial Class frmHauptfenster 'ToolStripSeparator23 ' Me.ToolStripSeparator23.Name = "ToolStripSeparator23" - Me.ToolStripSeparator23.Size = New System.Drawing.Size(388, 6) + Me.ToolStripSeparator23.Size = New System.Drawing.Size(380, 6) ' 'toolOriginalATR ' Me.toolOriginalATR.Image = Global.AVISO.My.Resources.Resources.atr Me.toolOriginalATR.Name = "toolOriginalATR" - Me.toolOriginalATR.Size = New System.Drawing.Size(391, 30) + Me.toolOriginalATR.Size = New System.Drawing.Size(383, 22) Me.toolOriginalATR.Text = "Original-ATR" ' 'SDLAbholaufträgeToolStripMenuItem ' Me.SDLAbholaufträgeToolStripMenuItem.Name = "SDLAbholaufträgeToolStripMenuItem" - Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.SDLAbholaufträgeToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.SDLAbholaufträgeToolStripMenuItem.Text = "SDL Abholaufträge" ' 'ToolStripMenuItem13 ' Me.ToolStripMenuItem13.Name = "ToolStripMenuItem13" - Me.ToolStripMenuItem13.Size = New System.Drawing.Size(391, 30) + Me.ToolStripMenuItem13.Size = New System.Drawing.Size(383, 22) Me.ToolStripMenuItem13.Text = "Postversand (Einschreiben)" ' 'VorauskassenToolStripMenuItem ' Me.VorauskassenToolStripMenuItem.Image = Global.AVISO.My.Resources.Resources.vorauszahlung Me.VorauskassenToolStripMenuItem.Name = "VorauskassenToolStripMenuItem" - Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.VorauskassenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.VorauskassenToolStripMenuItem.Text = "Vorauskassen" ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(388, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(380, 6) ' 'EssensbestellungenToolStripMenuItem ' Me.EssensbestellungenToolStripMenuItem.Name = "EssensbestellungenToolStripMenuItem" - Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.EssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.EssensbestellungenToolStripMenuItem.Text = "Essensbestellungen" Me.EssensbestellungenToolStripMenuItem.Visible = False ' 'AdministrationEssensbestellungenToolStripMenuItem ' Me.AdministrationEssensbestellungenToolStripMenuItem.Name = "AdministrationEssensbestellungenToolStripMenuItem" - Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.AdministrationEssensbestellungenToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.AdministrationEssensbestellungenToolStripMenuItem.Text = "Administration Essensbestellungen" Me.AdministrationEssensbestellungenToolStripMenuItem.Visible = False ' 'ToolStripSeparator24 ' Me.ToolStripSeparator24.Name = "ToolStripSeparator24" - Me.ToolStripSeparator24.Size = New System.Drawing.Size(388, 6) + Me.ToolStripSeparator24.Size = New System.Drawing.Size(380, 6) ' 'WarenorteToolStripMenuItem ' Me.WarenorteToolStripMenuItem.Name = "WarenorteToolStripMenuItem" - Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.WarenorteToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.WarenorteToolStripMenuItem.Text = "Warenorte" ' 'DatevBuchungsexportToolStripMenuItem ' Me.DatevBuchungsexportToolStripMenuItem.Name = "DatevBuchungsexportToolStripMenuItem" - Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.DatevBuchungsexportToolStripMenuItem.Text = "Datev Buchungsexport" Me.DatevBuchungsexportToolStripMenuItem.Visible = False ' 'APIToolStripMenuItem ' Me.APIToolStripMenuItem.Name = "APIToolStripMenuItem" - Me.APIToolStripMenuItem.Size = New System.Drawing.Size(391, 30) + Me.APIToolStripMenuItem.Size = New System.Drawing.Size(383, 22) Me.APIToolStripMenuItem.Text = "API" ' 'StatistikToolStripMenuItem @@ -3736,6 +3737,12 @@ Partial Class frmHauptfenster Me.HomepageToolStripMenuItem.Size = New System.Drawing.Size(133, 22) Me.HomepageToolStripMenuItem.Text = "Homepage" ' + 'AnhangsartenToolStripMenuItem + ' + Me.AnhangsartenToolStripMenuItem.Name = "AnhangsartenToolStripMenuItem" + Me.AnhangsartenToolStripMenuItem.Size = New System.Drawing.Size(209, 22) + Me.AnhangsartenToolStripMenuItem.Text = "Anhangsarten" + ' 'frmHauptfenster ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -4168,4 +4175,5 @@ Partial Class frmHauptfenster Friend WithEvents ATVeragCSToolStripMenuItem As ToolStripMenuItem Friend WithEvents DEVeragGmbHToolStripMenuItem As ToolStripMenuItem Friend WithEvents ATUnispedGmbHToolStripMenuItem As ToolStripMenuItem + Friend WithEvents AnhangsartenToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 7af8ce0..91fc88d 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -308,7 +308,6 @@ Public Class frmHauptfenster ElseIf IsNumeric(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId) Then cboMyAvisoAnzeige.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId) ' MyComboBox2.changeItem(VERAG_PROG_ALLGEMEIN.cAllgemein.MITARBEITER.mit_teamId) - End If End If @@ -4545,10 +4544,13 @@ Public Class frmHauptfenster End Sub Private Sub VERAGWIKIToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VERAGWIKIToolStripMenuItem.Click - + Process.Start("https://wiki.verag.ag/") End Sub - + Private Sub AnhangsartenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AnhangsartenToolStripMenuItem.Click + Dim f = New frmAvisoAnhangsarten("tblAvisoAnhangsArten", "AVISO") + f.Show() + End Sub End Class Public Class AvisoStatusFunctions