diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index d72adfb..a66f6d5 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -108,7 +108,7 @@ x64 - Aviso_TemporaryKey.pfx + LME.pfx @@ -582,6 +582,12 @@ Form + + frmNorsware.vb + + + Form + frmRoutendauerBerechnen.vb @@ -1137,6 +1143,9 @@ frmNCTSRouten.vb + + frmNorsware.vb + frmRoutendauerBerechnen.vb diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index ac4e116..f345918 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 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() + 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() Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem() Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -132,6 +132,7 @@ Partial Class frmHauptfenster Me.EssensbestellungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AdministrationEssensbestellungenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.WarenorteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.DatevBuchungsexportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.StatistikToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.LKWBerichtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.StatistikADMINToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -377,7 +378,7 @@ Partial Class frmHauptfenster Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() Me.Panel3 = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel() - Me.DatevBuchungsexportToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.APIToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.pnlDetailsRechts.SuspendLayout() @@ -844,7 +845,7 @@ Partial Class frmHauptfenster ' 'FunktionenToolStripMenuItem ' - Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragAGToolStripMenuItem, Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragCSToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator11, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.WarenorteToolStripMenuItem, Me.DatevBuchungsexportToolStripMenuItem}) + Me.FunktionenToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GenerelleGestellungenDurchsuchenToolStripMenuItem, Me.KundenVonFremdenSpeditionenToolStripMenuItem, Me.KundenverwaltungToolStripMenuItem, Me.MDMParkplatzkartenToolStripMenuItem, Me.SMSSendenToolStripMenuItem, Me.ZollprogrammeNachEORIDurchsuchenToolStripMenuItem, Me.MRNBarcodedruckToolStripMenuItem, Me.ToolStripSeparator12, Me.tool_BRGXLS, Me.ToolStripMenuItem4, Me.ToolStripMenuItem5, Me.BürgschaftenExcelToolStripMenuItem, Me.ToolStripMenuItem6, Me.DEGesamtsicherheitVeragGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragAGToolStripMenuItem, Me.ATGesamtsicherheitIMEXCSGmbHToolStripMenuItem, Me.ATGesamtsicherheitVeragCSToolStripMenuItem, Me.ToolStripMenuItem10, Me.TICKETWaidhausToolStripMenuItem, Me.ToolStripSeparator10, Me.DAKOSYToolStripMenuItem, Me.ToolStripSeparator11, Me.SDLAbholaufträgeToolStripMenuItem, Me.ToolStripMenuItem13, Me.VorauskassenToolStripMenuItem, Me.EssensbestellungenToolStripMenuItem, Me.AdministrationEssensbestellungenToolStripMenuItem, Me.WarenorteToolStripMenuItem, Me.DatevBuchungsexportToolStripMenuItem, Me.APIToolStripMenuItem}) Me.FunktionenToolStripMenuItem.Name = "FunktionenToolStripMenuItem" Me.FunktionenToolStripMenuItem.Size = New System.Drawing.Size(79, 21) Me.FunktionenToolStripMenuItem.Text = "Funktionen" @@ -1046,6 +1047,13 @@ Partial Class frmHauptfenster Me.WarenorteToolStripMenuItem.Text = "Warenorte" Me.WarenorteToolStripMenuItem.Visible = False ' + 'DatevBuchungsexportToolStripMenuItem + ' + Me.DatevBuchungsexportToolStripMenuItem.Name = "DatevBuchungsexportToolStripMenuItem" + Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.DatevBuchungsexportToolStripMenuItem.Text = "Datev Buchungsexport" + Me.DatevBuchungsexportToolStripMenuItem.Visible = False + ' 'StatistikToolStripMenuItem ' Me.StatistikToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.LKWBerichtToolStripMenuItem, Me.StatistikADMINToolStripMenuItem, Me.ToolStripSeparator8, Me.BürgschafrtsbuchungenFremdToolStripMenuItem, Me.LKWEingetroffenNachToolStripMenuItem, Me.ToolStripSeparator7, Me.SDLAuswertungenToolStripMenuItem, Me.SDLAuswertungenToolStripMenuItem1}) @@ -2395,38 +2403,38 @@ Partial Class frmHauptfenster Me.gridMyAviso.AllowUserToDeleteRows = False Me.gridMyAviso.AllowUserToOrderColumns = True Me.gridMyAviso.AllowUserToResizeRows = False - DataGridViewCellStyle10.BackColor = System.Drawing.Color.Azure - Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure + Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White - 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 + 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 Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - 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 + 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 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 - 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 + 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 Me.gridMyAviso.RowHeadersVisible = False Me.gridMyAviso.RowHeadersWidth = 62 Me.gridMyAviso.Size = New System.Drawing.Size(488, 279) @@ -2839,47 +2847,47 @@ Partial Class frmHauptfenster Me.gridAviso.AllowUserToAddRows = False Me.gridAviso.AllowUserToDeleteRows = False Me.gridAviso.AllowUserToResizeRows = False - DataGridViewCellStyle14.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 + DataGridViewCellStyle5.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable - 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 + 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 Me.gridAviso.ColumnHeadersHeight = 25 Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - 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 + 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 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 - 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 + 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 Me.gridAviso.RowHeadersVisible = False Me.gridAviso.RowHeadersWidth = 62 Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle18 + DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle9 Me.gridAviso.RowTemplate.ReadOnly = True Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect @@ -3611,12 +3619,11 @@ Partial Class frmHauptfenster Me.Panel4.Size = New System.Drawing.Size(170, 25) Me.Panel4.TabIndex = 4 ' - 'DatevBuchungsexportToolStripMenuItem + 'APIToolStripMenuItem ' - Me.DatevBuchungsexportToolStripMenuItem.Name = "DatevBuchungsexportToolStripMenuItem" - Me.DatevBuchungsexportToolStripMenuItem.Size = New System.Drawing.Size(383, 22) - Me.DatevBuchungsexportToolStripMenuItem.Text = "Datev Buchungsexport" - Me.DatevBuchungsexportToolStripMenuItem.Visible = False + Me.APIToolStripMenuItem.Name = "APIToolStripMenuItem" + Me.APIToolStripMenuItem.Size = New System.Drawing.Size(383, 22) + Me.APIToolStripMenuItem.Text = "API" ' 'frmHauptfenster ' @@ -4035,4 +4042,5 @@ Partial Class frmHauptfenster Friend WithEvents Panel4 As Panel Friend WithEvents CarnetTIRALTToolStripMenuItem As ToolStripMenuItem Friend WithEvents DatevBuchungsexportToolStripMenuItem As ToolStripMenuItem + Friend WithEvents APIToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmHauptfenster.resx b/Aviso/frmHauptfenster.resx index 0a40422..1b1c7ab 100644 --- a/Aviso/frmHauptfenster.resx +++ b/Aviso/frmHauptfenster.resx @@ -228,9 +228,6 @@ pOTzPwAAAABJRU5ErkJggg== - - 598, 17 - 697, 17 diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 089d032..6a45424 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -4469,6 +4469,11 @@ Public Class frmHauptfenster MsgBox("Es wurden keine Buchungen exportiert!") End If End Sub + + Private Sub APIToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles APIToolStripMenuItem.Click + Dim f As New frmNorsware() + f.ShowDialog(Me) + End Sub End Class Public Class AvisoStatusFunctions diff --git a/Aviso/frmNorsware.Designer.vb b/Aviso/frmNorsware.Designer.vb new file mode 100644 index 0000000..9a443d5 --- /dev/null +++ b/Aviso/frmNorsware.Designer.vb @@ -0,0 +1,192 @@ + _ +Partial Class frmNorsware + 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.components = New System.ComponentModel.Container() + Me.btnUpload = New System.Windows.Forms.Button() + Me.rtfDetals = New System.Windows.Forms.RichTextBox() + Me.Label2 = New System.Windows.Forms.Label() + Me.rtfToken = New System.Windows.Forms.RichTextBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.btnCreateToken = New System.Windows.Forms.Button() + Me.scanSonstiges = New VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList() + Me.dgvData = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.Label3 = New System.Windows.Forms.Label() + Me.Button1 = New System.Windows.Forms.Button() + Me.Button2 = New System.Windows.Forms.Button() + CType(Me.dgvData, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'btnUpload + ' + Me.btnUpload.Enabled = False + Me.btnUpload.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnUpload.Location = New System.Drawing.Point(170, 179) + Me.btnUpload.Name = "btnUpload" + Me.btnUpload.Size = New System.Drawing.Size(78, 25) + Me.btnUpload.TabIndex = 104 + Me.btnUpload.Text = "Upload" + Me.btnUpload.UseVisualStyleBackColor = True + ' + 'rtfDetals + ' + Me.rtfDetals.Location = New System.Drawing.Point(286, 30) + Me.rtfDetals.Name = "rtfDetals" + Me.rtfDetals.Size = New System.Drawing.Size(277, 484) + Me.rtfDetals.TabIndex = 108 + Me.rtfDetals.Text = "" + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.Label2.Location = New System.Drawing.Point(12, 215) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(37, 13) + Me.Label2.TabIndex = 105 + Me.Label2.Text = "Status" + ' + 'rtfToken + ' + Me.rtfToken.Location = New System.Drawing.Point(12, 30) + Me.rtfToken.Name = "rtfToken" + Me.rtfToken.Size = New System.Drawing.Size(236, 42) + Me.rtfToken.TabIndex = 109 + Me.rtfToken.Text = "" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.Label1.Location = New System.Drawing.Point(10, 14) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(98, 13) + Me.Label1.TabIndex = 110 + Me.Label1.Text = "Token (valid 24hrs)" + Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'btnCreateToken + ' + Me.btnCreateToken.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnCreateToken.Location = New System.Drawing.Point(133, 78) + Me.btnCreateToken.Name = "btnCreateToken" + Me.btnCreateToken.Size = New System.Drawing.Size(115, 25) + Me.btnCreateToken.TabIndex = 111 + Me.btnCreateToken.Text = "Create Token" + Me.btnCreateToken.UseVisualStyleBackColor = True + ' + 'scanSonstiges + ' + Me.scanSonstiges._DATENSERVER_KATEGORIE = "DOKUMENTE" + Me.scanSonstiges._DATENSERVER_ORDNER = "NORSWARE-UPLOAD" + Me.scanSonstiges._DATENSERVER_UOrdner1 = "" + Me.scanSonstiges._DATENSERVER_UOrdner2 = "" + Me.scanSonstiges._DATENSERVER_UOrdner3 = "" + Me.scanSonstiges._OPEN_ORIGINAL = True + Me.scanSonstiges._TYPE = "PDF" + Me.scanSonstiges.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.scanSonstiges.BackColor = System.Drawing.Color.White + Me.scanSonstiges.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.scanSonstiges.Cursor = System.Windows.Forms.Cursors.Default + Me.scanSonstiges.Location = New System.Drawing.Point(15, 106) + Me.scanSonstiges.Margin = New System.Windows.Forms.Padding(0) + Me.scanSonstiges.Name = "scanSonstiges" + Me.scanSonstiges.Size = New System.Drawing.Size(233, 70) + Me.scanSonstiges.TabIndex = 112 + ' + 'dgvData + ' + Me.dgvData.AKTUALISIERUNGS_INTERVALL = -1 + Me.dgvData.BackgroundColor = System.Drawing.Color.White + Me.dgvData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dgvData.Location = New System.Drawing.Point(15, 231) + Me.dgvData.Name = "dgvData" + Me.dgvData.Size = New System.Drawing.Size(233, 252) + Me.dgvData.TabIndex = 113 + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.Label3.Location = New System.Drawing.Point(12, 486) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(0, 13) + Me.Label3.TabIndex = 114 + ' + 'Button1 + ' + Me.Button1.Enabled = False + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Location = New System.Drawing.Point(153, 489) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(95, 25) + Me.Button1.TabIndex = 115 + Me.Button1.Text = "Send Selection" + Me.Button1.UseVisualStyleBackColor = True + ' + 'Button2 + ' + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.Location = New System.Drawing.Point(12, 78) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(115, 25) + Me.Button2.TabIndex = 116 + Me.Button2.Text = "Clear Token" + Me.Button2.UseVisualStyleBackColor = True + ' + 'frmNorsware + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(600, 558) + Me.Controls.Add(Me.Button2) + Me.Controls.Add(Me.Button1) + Me.Controls.Add(Me.Label3) + Me.Controls.Add(Me.dgvData) + Me.Controls.Add(Me.scanSonstiges) + Me.Controls.Add(Me.btnCreateToken) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.rtfToken) + Me.Controls.Add(Me.rtfDetals) + Me.Controls.Add(Me.Label2) + Me.Controls.Add(Me.btnUpload) + Me.Name = "frmNorsware" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "frmNorsware" + CType(Me.dgvData, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents btnUpload As Button + Friend WithEvents rtfDetals As RichTextBox + Friend WithEvents Label2 As Label + Friend WithEvents rtfToken As RichTextBox + Friend WithEvents Label1 As Label + Friend WithEvents btnCreateToken As Button + Friend WithEvents scanSonstiges As VERAG_PROG_ALLGEMEIN.usrcntlPDFScanList + Friend WithEvents dgvData As VERAG_PROG_ALLGEMEIN.MyDatagridview + Friend WithEvents Label3 As Label + Friend WithEvents Button1 As Button + Friend WithEvents Button2 As Button +End Class diff --git a/Aviso/frmNorsware.resx b/Aviso/frmNorsware.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Aviso/frmNorsware.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/frmNorsware.vb b/Aviso/frmNorsware.vb new file mode 100644 index 0000000..9278811 --- /dev/null +++ b/Aviso/frmNorsware.vb @@ -0,0 +1,122 @@ +Imports DocumentFormat.OpenXml.Office2010.ExcelAc +Imports VERAG_PROG_ALLGEMEIN + +Public Class frmNorsware + + Dim nwapi As cNorsware + Dim dataTable As New DataTable() + Dim groupId As String + Private Sub btnUpload_Click(sender As Object, e As EventArgs) Handles btnUpload.Click + + 'If nwapi.authenticate("nwtest", "test35*") = "200" Then + + Dim path = scanSonstiges.DS.GET_TOP1_PATH + dataTable.Clear() + Label1.Text = nwapi.UploadPDFWithAuthHeader(path, "", "POST", rtfToken.Text, dataTable) + initDGV(dataTable) + 'End if + + End Sub + + Private Sub btnCreateToken_Click(sender As Object, e As EventArgs) Handles btnCreateToken.Click + Label2.Text = "Status: " & nwapi.authenticate("nwtest", "test35*", rtfToken.Text) + If rtfToken.Text <> "" Then + Label1.Text = "Token (valid 24hrs) until: " & Now().AddHours(24) + Else + Label1.Text = "Token (valid 24hrs)" + End If + + End Sub + + Private Sub frmNorsware_Load(sender As Object, e As EventArgs) Handles MyBase.Load + nwapi = New cNorsware() + scanSonstiges.INIT(-1, "KUNDENDATEN") + initDataTable() + + + End Sub + + Private Sub rtfToken_TextChanged(sender As Object, e As EventArgs) Handles rtfToken.TextChanged + If rtfToken.Text <> "" Then + btnUpload.Enabled = True + btnCreateToken.Enabled = False + Else + btnUpload.Enabled = False + btnCreateToken.Enabled = True + End If + End Sub + + Sub initDataTable() + + dataTable.Columns.Add("adi", GetType(String)) + dataTable.Columns.Add("id", GetType(String)) + dataTable.Columns.Add("ihracatBeyannamesi", GetType(Boolean)) + dataTable.Columns.Add("ekBelge", GetType(Boolean)) + dataTable.Columns.Add("sira", GetType(Integer)) + dataTable.Columns.Add("secildi", GetType(Boolean)) + dataTable.Columns.Add("ogretildi", GetType(Integer)) + dataTable.Columns.Add("kayitTarihi", GetType(String)) + dataTable.Columns.Add("dosyaGrupId", GetType(String)) + + + End Sub + + Sub initDGV(dt As DataTable) + + dgvData.DataSource = dt + + + If dgvData.Columns.Count > 0 Then + With dgvData + '.RowHeadersWidth = 10 + '.Columns("id").Visible = False + '.Columns("country").Visible = False + '.Columns("name").HeaderText = "Name" + '.Columns("name").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill + '.Columns("safeNo").Width = 100 + '.Columns("safeNo").HeaderText = "Nr" + '.Columns("safeNo").Visible = False + '.Columns("vatNo").Width = 100 + '.Columns("vatNo").HeaderText = "UID" + '.Columns("regNo").Width = 100 + '.Columns("regNo").HeaderText = "FB-Nr." + '.Columns("street").Width = 100 + '.Columns("street").HeaderText = "Strasse" + '.Columns("city").Width = 100 + '.Columns("city").HeaderText = "Ort" + '.Columns("postCode").Width = 75 + '.Columns("postCode").HeaderText = "PLZ" + '.Columns("phoneNo").Width = 100 + '.Columns("phoneNo").HeaderText = "Tel-Nr" + '.Columns("status").Width = 100 + '.Columns("status").HeaderText = "Status" + '.Columns("dateOfLatestChange").Width = 100 + '.Columns("dateOfLatestChange").HeaderText = "letzte Änderung" + End With + Button1.Enabled = True + Else + Button1.Enabled = False + + End If + + + End Sub + + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click + rtfToken.Text = "" + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + + Cursor = Cursors.WaitCursor + + Label2.Text = "Status: " & nwapi.sendSelection(rtfToken.Text, "application/json", dataTable, groupId) + + If groupId <> "" Then + rtfDetals.Text = nwapi.getData(rtfToken.Text, "application/json", groupId) + End If + + Cursor = Cursors.Default + + End Sub +End Class \ No newline at end of file