From 325fabf9931a8f52c13417276187ad46a99c8e10 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Thu, 6 Jun 2024 22:24:35 +0200 Subject: [PATCH] Vermerke --- Aviso/App.config | 2 +- Aviso/Aviso.vbproj | 34 ++- Aviso/frmSendungsdetailsNEU.Designer.vb | 282 +++++++++++++++++++++--- Aviso/frmSendungsdetailsNEU.resx | 15 ++ Aviso/frmSendungsdetailsNEU.vb | 221 ++++++++++++++++++- Aviso/packages.config | 11 +- Aviso/rCntrlVermerke.Designer.vb | 102 +++++++++ Aviso/rCntrlVermerke.resx | 120 ++++++++++ Aviso/rCntrlVermerke.vb | 177 +++++++++++++++ Aviso/usrcntlAktDetails.vb | 268 +++++++++++----------- 10 files changed, 1063 insertions(+), 169 deletions(-) create mode 100644 Aviso/rCntrlVermerke.Designer.vb create mode 100644 Aviso/rCntrlVermerke.resx create mode 100644 Aviso/rCntrlVermerke.vb diff --git a/Aviso/App.config b/Aviso/App.config index a4c3ed8..63ffc81 100644 --- a/Aviso/App.config +++ b/Aviso/App.config @@ -69,7 +69,7 @@ - + diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index ae0d828..93bef05 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -150,6 +150,9 @@ ..\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll + + ..\packages\EAGetMail.5.3.5\lib\net461\EAGetMail.dll + ..\Gemeinsames\bin\Debug\Gemeinsames.dll @@ -292,8 +295,8 @@ ..\..\..\dll\Spire.PDF\2023\Spire.PdfViewer.Forms.dll - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -311,18 +314,24 @@ ..\packages\System.IO.Packaging.4.0.0\lib\net46\System.IO.Packaging.dll - - ..\packages\System.Memory.4.5.0\lib\netstandard2.0\System.Memory.dll + + ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Security.Cryptography.Pkcs.8.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll + + + ..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll + ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll @@ -955,6 +964,12 @@ Settings.settings True + + rCntrlVermerke.vb + + + UserControl + rptAuswertung.vb @@ -1363,6 +1378,9 @@ Designer Resources.Designer.vb + + rCntrlVermerke.vb + rptAuswertung.vb diff --git a/Aviso/frmSendungsdetailsNEU.Designer.vb b/Aviso/frmSendungsdetailsNEU.Designer.vb index 624928d..9bd33ab 100644 --- a/Aviso/frmSendungsdetailsNEU.Designer.vb +++ b/Aviso/frmSendungsdetailsNEU.Designer.vb @@ -34,6 +34,15 @@ Partial Class frmSendungsdetailsNEU 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 DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle14 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 DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.pnl = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel() Me.TabControl1 = New System.Windows.Forms.TabControl() @@ -127,6 +136,15 @@ Partial Class frmSendungsdetailsNEU Me.dgvDigicust = New System.Windows.Forms.DataGridView() Me.Panel24 = New System.Windows.Forms.Panel() Me.Button19 = New System.Windows.Forms.Button() + Me.tbMail = New System.Windows.Forms.TabPage() + Me.dgvMail = New System.Windows.Forms.DataGridView() + Me.clmnSender = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnRec = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnSbj = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnAtt = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.clmnUIDL = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.Panel25 = New System.Windows.Forms.Panel() + Me.Button23 = New System.Windows.Forms.Button() Me.Panel14 = New System.Windows.Forms.Panel() Me.pnlDetails = New System.Windows.Forms.Panel() Me.tbcntr = New System.Windows.Forms.TabControl() @@ -445,6 +463,7 @@ Partial Class frmSendungsdetailsNEU Me.ContextMenuStrip3 = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.XXXToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.timerValidation = New System.Windows.Forms.Timer(Me.components) + Me.RCntrlVermerke1 = New AVISO.rCntrlVermerke() Me.pnl.SuspendLayout() Me.Panel4.SuspendLayout() Me.TabControl1.SuspendLayout() @@ -472,6 +491,9 @@ Partial Class frmSendungsdetailsNEU Me.tbDigicust.SuspendLayout() CType(Me.dgvDigicust, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel24.SuspendLayout() + Me.tbMail.SuspendLayout() + CType(Me.dgvMail, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel25.SuspendLayout() Me.pnlDetails.SuspendLayout() Me.tbcntr.SuspendLayout() Me.TabPage4.SuspendLayout() @@ -549,6 +571,7 @@ Partial Class frmSendungsdetailsNEU Me.TabControl1.Controls.Add(Me.TabPage3) Me.TabControl1.Controls.Add(Me.tbATEZ) Me.TabControl1.Controls.Add(Me.tbDigicust) + Me.TabControl1.Controls.Add(Me.tbMail) Me.TabControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.TabControl1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) Me.TabControl1.Location = New System.Drawing.Point(0, 3) @@ -598,7 +621,7 @@ Partial Class frmSendungsdetailsNEU Me.tbAnhang.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.tbAnhang.Location = New System.Drawing.Point(4, 29) Me.tbAnhang.Name = "tbAnhang" - Me.tbAnhang.Size = New System.Drawing.Size(1206, 288) + Me.tbAnhang.Size = New System.Drawing.Size(1206, 289) Me.tbAnhang.TabIndex = 4 Me.tbAnhang.Text = "Anhang" Me.tbAnhang.UseVisualStyleBackColor = True @@ -616,9 +639,10 @@ Partial Class frmSendungsdetailsNEU Me.dgvAnhang.Name = "dgvAnhang" Me.dgvAnhang.ReadOnly = True Me.dgvAnhang.RowHeadersVisible = False + Me.dgvAnhang.RowHeadersWidth = 51 Me.dgvAnhang.RowTemplate.Height = 40 Me.dgvAnhang.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvAnhang.Size = New System.Drawing.Size(1206, 243) + Me.dgvAnhang.Size = New System.Drawing.Size(1206, 244) Me.dgvAnhang.TabIndex = 1 ' 'btnDirektAnfuegen @@ -862,7 +886,7 @@ Partial Class frmSendungsdetailsNEU Me.tbZollabfertigung.Controls.Add(Me.Panel16) Me.tbZollabfertigung.Location = New System.Drawing.Point(4, 29) Me.tbZollabfertigung.Name = "tbZollabfertigung" - Me.tbZollabfertigung.Size = New System.Drawing.Size(1206, 288) + Me.tbZollabfertigung.Size = New System.Drawing.Size(1206, 289) Me.tbZollabfertigung.TabIndex = 2 Me.tbZollabfertigung.Text = "Zollabfertigung" Me.tbZollabfertigung.UseVisualStyleBackColor = True @@ -876,7 +900,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.Panel16.Location = New System.Drawing.Point(0, 0) Me.Panel16.Name = "Panel16" - Me.Panel16.Size = New System.Drawing.Size(1206, 288) + Me.Panel16.Size = New System.Drawing.Size(1206, 289) Me.Panel16.TabIndex = 0 ' 'dgvZollAnmeldungen @@ -891,9 +915,10 @@ Partial Class frmSendungsdetailsNEU Me.dgvZollAnmeldungen.Location = New System.Drawing.Point(0, 32) Me.dgvZollAnmeldungen.Name = "dgvZollAnmeldungen" Me.dgvZollAnmeldungen.ReadOnly = True + Me.dgvZollAnmeldungen.RowHeadersWidth = 51 Me.dgvZollAnmeldungen.RowTemplate.Height = 30 Me.dgvZollAnmeldungen.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.dgvZollAnmeldungen.Size = New System.Drawing.Size(1206, 218) + Me.dgvZollAnmeldungen.Size = New System.Drawing.Size(1206, 219) Me.dgvZollAnmeldungen.TabIndex = 1 ' 'Panel17 @@ -902,7 +927,7 @@ Partial Class frmSendungsdetailsNEU Me.Panel17.Controls.Add(Me.Button6) Me.Panel17.Controls.Add(Me.Button5) Me.Panel17.Dock = System.Windows.Forms.DockStyle.Bottom - Me.Panel17.Location = New System.Drawing.Point(0, 250) + Me.Panel17.Location = New System.Drawing.Point(0, 251) Me.Panel17.Name = "Panel17" Me.Panel17.Size = New System.Drawing.Size(1206, 38) Me.Panel17.TabIndex = 2 @@ -939,6 +964,7 @@ Partial Class frmSendungsdetailsNEU Me.MenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem13, Me.ToolStripMenuItem7, Me.ToolStripMenuItem6, Me.ToolStripMenuItem11, Me.ToolStripMenuItem17, Me.ToolStripMenuItem21, Me.ToolStripMenuItem31, Me.ToolStripMenuItem12, Me.ToolStripMenuItem32}) Me.MenuStrip.Location = New System.Drawing.Point(0, 0) Me.MenuStrip.Name = "MenuStrip" + Me.MenuStrip.Padding = New System.Windows.Forms.Padding(5, 2, 0, 2) Me.MenuStrip.Size = New System.Drawing.Size(1206, 32) Me.MenuStrip.TabIndex = 0 ' @@ -1020,7 +1046,7 @@ Partial Class frmSendungsdetailsNEU ' Me.ToolStripMenuItem20.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem20.Name = "ToolStripMenuItem20" - Me.ToolStripMenuItem20.Size = New System.Drawing.Size(188, 30) + Me.ToolStripMenuItem20.Size = New System.Drawing.Size(103, 30) Me.ToolStripMenuItem20.Text = "EZA" ' 'ToolStripMenuItem18 @@ -1029,7 +1055,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem18.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem18.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem18.Name = "ToolStripMenuItem18" - Me.ToolStripMenuItem18.Size = New System.Drawing.Size(188, 30) + Me.ToolStripMenuItem18.Size = New System.Drawing.Size(103, 30) Me.ToolStripMenuItem18.Text = "T1" ' 'ToolStripMenuItem19 @@ -1038,7 +1064,7 @@ Partial Class frmSendungsdetailsNEU Me.ToolStripMenuItem19.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.ToolStripMenuItem19.Image = Global.AVISO.My.Resources.Resources.plus Me.ToolStripMenuItem19.Name = "ToolStripMenuItem19" - Me.ToolStripMenuItem19.Size = New System.Drawing.Size(188, 30) + Me.ToolStripMenuItem19.Size = New System.Drawing.Size(103, 30) Me.ToolStripMenuItem19.Text = "T2" ' 'ToolStripMenuItem21 @@ -1107,8 +1133,8 @@ Partial Class frmSendungsdetailsNEU Me.TabPage1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.TabPage1.Location = New System.Drawing.Point(4, 29) Me.TabPage1.Name = "TabPage1" - Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(1206, 288) + Me.TabPage1.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.TabPage1.Size = New System.Drawing.Size(1206, 289) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Kunden - Zolltarif" Me.TabPage1.UseVisualStyleBackColor = True @@ -1124,7 +1150,7 @@ Partial Class frmSendungsdetailsNEU Me.pnlKundenZolltarif.Location = New System.Drawing.Point(3, 36) Me.pnlKundenZolltarif.MinimumSize = New System.Drawing.Size(2, 103) Me.pnlKundenZolltarif.Name = "pnlKundenZolltarif" - Me.pnlKundenZolltarif.Size = New System.Drawing.Size(1200, 249) + Me.pnlKundenZolltarif.Size = New System.Drawing.Size(1200, 250) Me.pnlKundenZolltarif.TabIndex = 1 Me.pnlKundenZolltarif.TabStop = True ' @@ -1133,7 +1159,7 @@ Partial Class frmSendungsdetailsNEU Me.Label22.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label22.AutoSize = True - Me.Label22.Location = New System.Drawing.Point(4, 208) + Me.Label22.Location = New System.Drawing.Point(4, 209) Me.Label22.Name = "Label22" Me.Label22.Size = New System.Drawing.Size(209, 13) Me.Label22.TabIndex = 0 @@ -1145,7 +1171,7 @@ Partial Class frmSendungsdetailsNEU Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.AutoSize = True - Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.Location = New System.Drawing.Point(4, 222) + Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.Location = New System.Drawing.Point(4, 224) Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.Name = "lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden" Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.Size = New System.Drawing.Size(338, 13) Me.lblBitteEinenEmpfangerAuswahlenUmDenKundenZolltarifEinzublenden.TabIndex = 1 @@ -1190,8 +1216,8 @@ Partial Class frmSendungsdetailsNEU Me.TabPage2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.TabPage2.Location = New System.Drawing.Point(4, 29) Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(1206, 288) + Me.TabPage2.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.TabPage2.Size = New System.Drawing.Size(1206, 289) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Speditionsbuch" Me.TabPage2.UseVisualStyleBackColor = True @@ -1208,7 +1234,8 @@ Partial Class frmSendungsdetailsNEU Me.DataGridView.Dock = System.Windows.Forms.DockStyle.Fill Me.DataGridView.Location = New System.Drawing.Point(3, 94) Me.DataGridView.Name = "DataGridView" - Me.DataGridView.Size = New System.Drawing.Size(1200, 191) + Me.DataGridView.RowHeadersWidth = 51 + Me.DataGridView.Size = New System.Drawing.Size(1200, 192) Me.DataGridView.TabIndex = 1 ' 'pnlSpedBuchNacherfassung @@ -1518,6 +1545,7 @@ Partial Class frmSendungsdetailsNEU ' 'TabPage3 ' + Me.TabPage3.Controls.Add(Me.RCntrlVermerke1) Me.TabPage3.Controls.Add(Me.gridVermerke) Me.TabPage3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.TabPage3.Location = New System.Drawing.Point(4, 29) @@ -1544,6 +1572,7 @@ Partial Class frmSendungsdetailsNEU DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 + Me.gridVermerke.ColumnHeadersHeight = 29 Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill Me.gridVermerke.Location = New System.Drawing.Point(0, 0) @@ -1551,6 +1580,7 @@ Partial Class frmSendungsdetailsNEU Me.gridVermerke.Name = "gridVermerke" Me.gridVermerke.ReadOnly = True Me.gridVermerke.RowHeadersVisible = False + Me.gridVermerke.RowHeadersWidth = 51 Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle3 @@ -1570,8 +1600,8 @@ Partial Class frmSendungsdetailsNEU Me.tbATEZ.Controls.Add(Me.Panel23) Me.tbATEZ.Location = New System.Drawing.Point(4, 29) Me.tbATEZ.Name = "tbATEZ" - Me.tbATEZ.Padding = New System.Windows.Forms.Padding(3) - Me.tbATEZ.Size = New System.Drawing.Size(1206, 288) + Me.tbATEZ.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.tbATEZ.Size = New System.Drawing.Size(1206, 289) Me.tbATEZ.TabIndex = 6 Me.tbATEZ.Text = "ATEZ" Me.tbATEZ.UseVisualStyleBackColor = True @@ -1593,6 +1623,7 @@ Partial Class frmSendungsdetailsNEU DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvATEZNCTS.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5 + Me.dgvATEZNCTS.ColumnHeadersHeight = 29 Me.dgvATEZNCTS.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.dgvATEZNCTS.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvATEZNCTS.Location = New System.Drawing.Point(3, 48) @@ -1600,6 +1631,7 @@ Partial Class frmSendungsdetailsNEU Me.dgvATEZNCTS.Name = "dgvATEZNCTS" Me.dgvATEZNCTS.ReadOnly = True Me.dgvATEZNCTS.RowHeadersVisible = False + Me.dgvATEZNCTS.RowHeadersWidth = 51 Me.dgvATEZNCTS.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvATEZNCTS.RowsDefaultCellStyle = DataGridViewCellStyle6 @@ -1609,7 +1641,7 @@ Partial Class frmSendungsdetailsNEU Me.dgvATEZNCTS.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvATEZNCTS.ShowCellErrors = False Me.dgvATEZNCTS.ShowRowErrors = False - Me.dgvATEZNCTS.Size = New System.Drawing.Size(1200, 237) + Me.dgvATEZNCTS.Size = New System.Drawing.Size(1200, 238) Me.dgvATEZNCTS.TabIndex = 105 Me.dgvATEZNCTS.TabStop = False ' @@ -1643,7 +1675,7 @@ Partial Class frmSendungsdetailsNEU Me.tbDigicust.Controls.Add(Me.Panel24) Me.tbDigicust.Location = New System.Drawing.Point(4, 29) Me.tbDigicust.Name = "tbDigicust" - Me.tbDigicust.Size = New System.Drawing.Size(1206, 288) + Me.tbDigicust.Size = New System.Drawing.Size(1206, 289) Me.tbDigicust.TabIndex = 7 Me.tbDigicust.Text = "Digicust" Me.tbDigicust.UseVisualStyleBackColor = True @@ -1665,6 +1697,7 @@ Partial Class frmSendungsdetailsNEU DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvDigicust.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle8 + Me.dgvDigicust.ColumnHeadersHeight = 29 Me.dgvDigicust.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing Me.dgvDigicust.Dock = System.Windows.Forms.DockStyle.Fill Me.dgvDigicust.Location = New System.Drawing.Point(0, 45) @@ -1672,6 +1705,7 @@ Partial Class frmSendungsdetailsNEU Me.dgvDigicust.Name = "dgvDigicust" Me.dgvDigicust.ReadOnly = True Me.dgvDigicust.RowHeadersVisible = False + Me.dgvDigicust.RowHeadersWidth = 51 Me.dgvDigicust.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] Me.dgvDigicust.RowsDefaultCellStyle = DataGridViewCellStyle9 @@ -1681,7 +1715,7 @@ Partial Class frmSendungsdetailsNEU Me.dgvDigicust.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvDigicust.ShowCellErrors = False Me.dgvDigicust.ShowRowErrors = False - Me.dgvDigicust.Size = New System.Drawing.Size(1206, 243) + Me.dgvDigicust.Size = New System.Drawing.Size(1206, 244) Me.dgvDigicust.TabIndex = 107 Me.dgvDigicust.TabStop = False ' @@ -1700,7 +1734,7 @@ Partial Class frmSendungsdetailsNEU Me.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button19.Image = Global.AVISO.My.Resources.Resources.plus Me.Button19.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.Button19.Location = New System.Drawing.Point(5, 8) + Me.Button19.Location = New System.Drawing.Point(4, 8) Me.Button19.Name = "Button19" Me.Button19.Size = New System.Drawing.Size(104, 34) Me.Button19.TabIndex = 9 @@ -1709,6 +1743,122 @@ Partial Class frmSendungsdetailsNEU Me.Button19.UseVisualStyleBackColor = True Me.Button19.Visible = False ' + 'tbMail + ' + Me.tbMail.Controls.Add(Me.dgvMail) + Me.tbMail.Controls.Add(Me.Panel25) + Me.tbMail.Location = New System.Drawing.Point(4, 29) + Me.tbMail.Name = "tbMail" + Me.tbMail.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.tbMail.Size = New System.Drawing.Size(1206, 289) + Me.tbMail.TabIndex = 8 + Me.tbMail.Text = "Mail" + Me.tbMail.UseVisualStyleBackColor = True + ' + 'dgvMail + ' + Me.dgvMail.AllowUserToAddRows = False + Me.dgvMail.AllowUserToDeleteRows = False + Me.dgvMail.AllowUserToResizeRows = False + DataGridViewCellStyle10.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMail.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 + Me.dgvMail.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle11.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!) + 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.dgvMail.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11 + Me.dgvMail.ColumnHeadersHeight = 29 + Me.dgvMail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing + Me.dgvMail.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnSender, Me.clmnRec, Me.clmnSbj, Me.clmnAtt, Me.clmnUIDL}) + Me.dgvMail.Dock = System.Windows.Forms.DockStyle.Fill + Me.dgvMail.Location = New System.Drawing.Point(3, 48) + Me.dgvMail.MultiSelect = False + Me.dgvMail.Name = "dgvMail" + Me.dgvMail.ReadOnly = True + Me.dgvMail.RowHeadersVisible = False + Me.dgvMail.RowHeadersWidth = 51 + Me.dgvMail.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvMail.RowsDefaultCellStyle = DataGridViewCellStyle12 + Me.dgvMail.RowTemplate.Height = 20 + Me.dgvMail.RowTemplate.ReadOnly = True + Me.dgvMail.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvMail.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.dgvMail.ShowCellErrors = False + Me.dgvMail.ShowRowErrors = False + Me.dgvMail.Size = New System.Drawing.Size(1200, 238) + Me.dgvMail.TabIndex = 109 + Me.dgvMail.TabStop = False + ' + 'clmnSender + ' + Me.clmnSender.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.clmnSender.HeaderText = "Absender" + Me.clmnSender.MinimumWidth = 6 + Me.clmnSender.Name = "clmnSender" + Me.clmnSender.ReadOnly = True + ' + 'clmnRec + ' + Me.clmnRec.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.clmnRec.HeaderText = "Empfänger" + Me.clmnRec.MinimumWidth = 6 + Me.clmnRec.Name = "clmnRec" + Me.clmnRec.ReadOnly = True + ' + 'clmnSbj + ' + Me.clmnSbj.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.clmnSbj.HeaderText = "Betreff" + Me.clmnSbj.MinimumWidth = 6 + Me.clmnSbj.Name = "clmnSbj" + Me.clmnSbj.ReadOnly = True + ' + 'clmnAtt + ' + Me.clmnAtt.HeaderText = "Anhänge" + Me.clmnAtt.MinimumWidth = 6 + Me.clmnAtt.Name = "clmnAtt" + Me.clmnAtt.ReadOnly = True + Me.clmnAtt.Width = 70 + ' + 'clmnUIDL + ' + Me.clmnUIDL.HeaderText = "UIDL" + Me.clmnUIDL.MinimumWidth = 6 + Me.clmnUIDL.Name = "clmnUIDL" + Me.clmnUIDL.ReadOnly = True + Me.clmnUIDL.Width = 200 + ' + 'Panel25 + ' + Me.Panel25.Controls.Add(Me.Button23) + Me.Panel25.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel25.Location = New System.Drawing.Point(3, 3) + Me.Panel25.Name = "Panel25" + Me.Panel25.Size = New System.Drawing.Size(1200, 45) + Me.Panel25.TabIndex = 110 + ' + 'Button23 + ' + Me.Button23.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button23.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button23.Image = Global.AVISO.My.Resources.Resources.plus + Me.Button23.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button23.Location = New System.Drawing.Point(1, 8) + Me.Button23.Name = "Button23" + Me.Button23.Size = New System.Drawing.Size(104, 34) + Me.Button23.TabIndex = 9 + Me.Button23.Text = "Load" + Me.Button23.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button23.UseVisualStyleBackColor = True + Me.Button23.Visible = False + ' 'Panel14 ' Me.Panel14.BackColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) @@ -1784,7 +1934,7 @@ Partial Class frmSendungsdetailsNEU Me.TabPage4.Controls.Add(Me.Button14) Me.TabPage4.Location = New System.Drawing.Point(4, 22) Me.TabPage4.Name = "TabPage4" - Me.TabPage4.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage4.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) Me.TabPage4.Size = New System.Drawing.Size(433, 299) Me.TabPage4.TabIndex = 0 Me.TabPage4.Text = "Aktendeckel" @@ -2405,13 +2555,38 @@ Partial Class frmSendungsdetailsNEU Me.dgvVorkosten.AllowUserToResizeColumns = False Me.dgvVorkosten.AllowUserToResizeRows = False Me.dgvVorkosten.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, 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.dgvVorkosten.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle13 Me.dgvVorkosten.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvVorkosten.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnVK_id, Me.clmnFirma, Me.clmnLeistung, Me.clmnPreis}) + DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle15.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvVorkosten.DefaultCellStyle = DataGridViewCellStyle15 Me.dgvVorkosten.Location = New System.Drawing.Point(3, 4) Me.dgvVorkosten.MultiSelect = False Me.dgvVorkosten.Name = "dgvVorkosten" Me.dgvVorkosten.ReadOnly = True + DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control + 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.WindowText + DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvVorkosten.RowHeadersDefaultCellStyle = DataGridViewCellStyle16 Me.dgvVorkosten.RowHeadersVisible = False + Me.dgvVorkosten.RowHeadersWidth = 51 Me.dgvVorkosten.RowTemplate.Height = 18 Me.dgvVorkosten.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvVorkosten.Size = New System.Drawing.Size(360, 194) @@ -2420,14 +2595,17 @@ Partial Class frmSendungsdetailsNEU 'clmnVK_id ' Me.clmnVK_id.HeaderText = "ID" + Me.clmnVK_id.MinimumWidth = 6 Me.clmnVK_id.Name = "clmnVK_id" Me.clmnVK_id.ReadOnly = True Me.clmnVK_id.Visible = False + Me.clmnVK_id.Width = 125 ' 'clmnFirma ' Me.clmnFirma.HeaderText = "Firma" Me.clmnFirma.MaxInputLength = 200 + Me.clmnFirma.MinimumWidth = 6 Me.clmnFirma.Name = "clmnFirma" Me.clmnFirma.ReadOnly = True Me.clmnFirma.Width = 127 @@ -2436,6 +2614,7 @@ Partial Class frmSendungsdetailsNEU ' Me.clmnLeistung.HeaderText = "Leistung" Me.clmnLeistung.MaxInputLength = 30 + Me.clmnLeistung.MinimumWidth = 6 Me.clmnLeistung.Name = "clmnLeistung" Me.clmnLeistung.ReadOnly = True Me.clmnLeistung.Width = 129 @@ -2443,10 +2622,11 @@ Partial Class frmSendungsdetailsNEU 'clmnPreis ' Me.clmnPreis.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - DataGridViewCellStyle10.Format = "C2" - Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle10 + DataGridViewCellStyle14.Format = "C2" + Me.clmnPreis.DefaultCellStyle = DataGridViewCellStyle14 Me.clmnPreis.HeaderText = "Preis" Me.clmnPreis.MaxInputLength = 15 + Me.clmnPreis.MinimumWidth = 6 Me.clmnPreis.Name = "clmnPreis" Me.clmnPreis.ReadOnly = True ' @@ -2458,7 +2638,7 @@ Partial Class frmSendungsdetailsNEU Me.tbBAR.Controls.Add(Me.btnLeihgeld) Me.tbBAR.Location = New System.Drawing.Point(4, 22) Me.tbBAR.Name = "tbBAR" - Me.tbBAR.Padding = New System.Windows.Forms.Padding(3) + Me.tbBAR.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) Me.tbBAR.Size = New System.Drawing.Size(433, 299) Me.tbBAR.TabIndex = 1 Me.tbBAR.Text = "Abrechnung/BAR-Belege" @@ -2472,12 +2652,37 @@ Partial Class frmSendungsdetailsNEU Me.dgvBelege.AllowUserToResizeColumns = False Me.dgvBelege.AllowUserToResizeRows = False Me.dgvBelege.BackgroundColor = System.Drawing.Color.White + 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.[True] + Me.dgvBelege.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle17 Me.dgvBelege.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + DataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.dgvBelege.DefaultCellStyle = DataGridViewCellStyle18 Me.dgvBelege.Location = New System.Drawing.Point(6, 40) Me.dgvBelege.MultiSelect = False Me.dgvBelege.Name = "dgvBelege" Me.dgvBelege.ReadOnly = True + DataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.dgvBelege.RowHeadersDefaultCellStyle = DataGridViewCellStyle19 Me.dgvBelege.RowHeadersVisible = False + Me.dgvBelege.RowHeadersWidth = 51 Me.dgvBelege.RowTemplate.Height = 18 Me.dgvBelege.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvBelege.Size = New System.Drawing.Size(360, 165) @@ -5253,7 +5458,6 @@ Partial Class frmSendungsdetailsNEU ' Me.BindingNavigatorPositionItem.AccessibleName = "Position" Me.BindingNavigatorPositionItem.AutoSize = False - Me.BindingNavigatorPositionItem.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.BindingNavigatorPositionItem.Name = "BindingNavigatorPositionItem" Me.BindingNavigatorPositionItem.Size = New System.Drawing.Size(50, 23) Me.BindingNavigatorPositionItem.Text = "0" @@ -5656,6 +5860,7 @@ Partial Class frmSendungsdetailsNEU ' 'cntDigicust ' + Me.cntDigicust.ImageScalingSize = New System.Drawing.Size(20, 20) Me.cntDigicust.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StatusAbrufenToolStripMenuItem}) Me.cntDigicust.Name = "cntDigicust" Me.cntDigicust.Size = New System.Drawing.Size(151, 26) @@ -5668,6 +5873,7 @@ Partial Class frmSendungsdetailsNEU ' 'ContextMenuStrip3 ' + Me.ContextMenuStrip3.ImageScalingSize = New System.Drawing.Size(20, 20) Me.ContextMenuStrip3.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.XXXToolStripMenuItem}) Me.ContextMenuStrip3.Name = "cntxt" Me.ContextMenuStrip3.Size = New System.Drawing.Size(96, 26) @@ -5683,6 +5889,13 @@ Partial Class frmSendungsdetailsNEU Me.timerValidation.Enabled = True Me.timerValidation.Interval = 2000 ' + 'RCntrlVermerke1 + ' + Me.RCntrlVermerke1.Location = New System.Drawing.Point(251, 18) + Me.RCntrlVermerke1.Name = "RCntrlVermerke1" + Me.RCntrlVermerke1.Size = New System.Drawing.Size(575, 208) + Me.RCntrlVermerke1.TabIndex = 1 + ' 'frmSendungsdetailsNEU ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5733,6 +5946,9 @@ Partial Class frmSendungsdetailsNEU Me.tbDigicust.ResumeLayout(False) CType(Me.dgvDigicust, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel24.ResumeLayout(False) + Me.tbMail.ResumeLayout(False) + CType(Me.dgvMail, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel25.ResumeLayout(False) Me.pnlDetails.ResumeLayout(False) Me.tbcntr.ResumeLayout(False) Me.TabPage4.ResumeLayout(False) @@ -6201,4 +6417,14 @@ Partial Class frmSendungsdetailsNEU Friend WithEvents rtbValidierung As VERAG_PROG_ALLGEMEIN.MyRichTextBox Friend WithEvents Label15 As Label Friend WithEvents timerValidation As Timer + Friend WithEvents tbMail As TabPage + Friend WithEvents dgvMail As DataGridView + Friend WithEvents Panel25 As Panel + Friend WithEvents Button23 As Button + Friend WithEvents clmnSender As DataGridViewTextBoxColumn + Friend WithEvents clmnRec As DataGridViewTextBoxColumn + Friend WithEvents clmnSbj As DataGridViewTextBoxColumn + Friend WithEvents clmnAtt As DataGridViewTextBoxColumn + Friend WithEvents clmnUIDL As DataGridViewTextBoxColumn + Friend WithEvents RCntrlVermerke1 As rCntrlVermerke End Class diff --git a/Aviso/frmSendungsdetailsNEU.resx b/Aviso/frmSendungsdetailsNEU.resx index 9b5f099..725b4fa 100644 --- a/Aviso/frmSendungsdetailsNEU.resx +++ b/Aviso/frmSendungsdetailsNEU.resx @@ -1542,6 +1542,21 @@ 296, 17 + + True + + + True + + + True + + + True + + + True + iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAABGdBTUEAALGPC/xhBQAACQpJREFUaEPl diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index d58f841..f508b0a 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -8,6 +8,9 @@ Imports iTextSharp.text.pdf Imports Microsoft.Office.Interop Imports DocumentFormat.OpenXml.Presentation Imports SDL +Imports System.IO +Imports EAGetMail +Imports System.Globalization Public Class frmSendungsdetailsNEU Public AvisoId As Integer @@ -375,6 +378,7 @@ Public Class frmSendungsdetailsNEU Private Sub frmSendungsdetails_Load(sender As Object, e As EventArgs) Handles Me.Load VERAG_PROG_ALLGEMEIN.cAllgemein._TRANSLATE(Me) + Button23.Visible = True Try Panel5.BackColor = VERAG_PROG_ALLGEMEIN.cAllgemein.cSPECIFIC.FIRMA_BgColor @@ -512,6 +516,7 @@ Public Class frmSendungsdetailsNEU frmGrayOut.Close() AVISO = AvisoDAL.LesenAviso(AvisoId, "") Else + SAVE_ME() AvisoStatusFunctions.ummeldenAVISO(AVISO, it.Tag.ToString) End If Me.initDataBinding() @@ -3240,7 +3245,8 @@ Public Class frmSendungsdetailsNEU End Sub Private Sub initVermerke() - + RCntrlVermerke1.init(AVISO, SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) + Exit Sub ' If setAkive_AuswahlID() = -1 Then Exit Sub If AvisoId <= 0 Then Exit Sub @@ -6668,6 +6674,7 @@ Public Class frmSendungsdetailsNEU End Sub Private Sub btnLKWUmmelden_Click(sender As Object, e As EventArgs) Handles btnLKWUmmelden.Click + ContextMenuStrip3.Show(Cursor.Position) End Sub @@ -6913,4 +6920,216 @@ Public Class frmSendungsdetailsNEU VALIDATE_ME(False) End Sub + Private Sub Button23_Click_1(sender As Object, e As EventArgs) Handles Button23.Click + + With dgvMail + .Rows.Clear() + + Try + ' Create a folder named "inbox" under current directory + ' to save the email retrieved. + 'Dim localInbox As String = String.Format("{0}\inbox", Directory.GetCurrentDirectory()) + ' MsgBox(localInbox) + ' If the folder is not existed, create it. + ' If Not Directory.Exists(localInbox) Then + ' Directory.CreateDirectory(localInbox) + 'End If + + Dim oServer As New MailServer("owa.verag.ag", + "al@verag.ag", + "verag#2", + ServerProtocol.Imap4) + + ' Enable SSL/TLS connection, most modern email server require SSL/TLS connection by default. + oServer.SSLConnection = True + oServer.Port = 993 + + ' If your server doesn't support SSL/TLS connection, please use the following codes + ' oServer.SSLConnection = False + ' oServer.Port = 110 + + Console.WriteLine("Connecting server ...") + + Dim oClient As New MailClient("EG-D1710817841-00027-8F73639A7EE1E54E-7E5AA3751E31F532") + oClient.Connect(oServer) + + + 'Dim folders() As Imap4Folder = oClient.Imap4Folders + '' enumerates all folders on IMAP4/Exchange server. + 'EnumerateFolder(folders) + + Dim options As GetMailInfosOptionType = GetMailInfosOptionType.All + options = options Or GetMailInfosOptionType.DateRange + options = options Or GetMailInfosOptionType.OrderByDateTime + options = options Or GetMailInfosOptionType.IncludeAllFolders + + oClient.GetMailInfosParam.Reset() + oClient.GetMailInfosParam.GetMailInfosOptions = options + + oClient.GetMailInfosParam.SubjectContains = "EAGetMail Component" + ' oClient.GetMailInfosParam.UIDRange = "167355-167355" + 'oClient.GetMailInfosParam.BodyContains = "24DE770176692626M6" + 'oClient.GetMailInfosParam.SenderContains = "support" + oClient.GetMailInfosParam.DateRange.SINCE = System.DateTime.Now.AddMonths(-12) + oClient.GetMailInfosParam.DateRange.BEFORE = System.DateTime.Now.AddDays(1) + oClient.GetMailInfosParam.DateRange.BEFORE = System.DateTime.Now.AddDays(1) + + + Dim infos As MailInfo() = oClient.GetMailInfos() + Console.WriteLine("Total {0} email(s)", infos.Length) + + For i As Integer = 0 To infos.Length - 1 + Dim info As MailInfo = infos(i) + Console.WriteLine("Index: {0}; Size: {1}; UIDL: {2}", + info.Index, info.Size, info.UIDL) + + ' Retrieve email from IMAP server + Dim oMail As Mail = oClient.GetMail(info) + + Console.WriteLine("From: {0}", oMail.From.ToString()) + Console.WriteLine("Subject: {0}" & vbCr & vbLf, oMail.Subject) + '?? oMail.MAPIConversationId.ToString + .Rows.Add({oMail.From.ToString(), oMail.To.ToString(), oMail.Subject, oMail.Attachments.Count, info.UIDL}) + + ' Generate an unqiue email file name based on date time. + ' Dim fileName As String = _generateFileName(i + 1) + ' Dim fullPath As String = String.Format("{0}\{1}", localInbox, fileName) + + ' Save email to local disk + 'oMail.SaveAs(fullPath, True) + + ' Mark email as deleted from POP3 server. + '''''' oClient.Delete(info) + + Next + + ' Quit and expunge emails marked as deleted from POP3 server. + oClient.Quit() + Console.WriteLine("Completed!") + + Catch ep As Exception + Console.WriteLine(ep.Message) + Console.WriteLine(ep.StackTrace) + MsgBox(ep.Message & " - " & ep.StackTrace) + End Try + + + End With + + + End Sub + + 'Private Sub openMial(UIDL As String) + + + + ' Try + ' ' Create a folder named "inbox" under current directory + ' ' to save the email retrieved. + ' 'Dim localInbox As String = String.Format("{0}\inbox", Directory.GetCurrentDirectory()) + ' ' MsgBox(localInbox) + ' ' If the folder is not existed, create it. + ' ' If Not Directory.Exists(localInbox) Then + ' ' Directory.CreateDirectory(localInbox) + ' 'End If + + ' Dim oServer As New MailServer("owa.verag.ag", + ' "al@verag.ag", + ' "verag#2", + ' ServerProtocol.Imap4) + + ' ' Enable SSL/TLS connection, most modern email server require SSL/TLS connection by default. + ' oServer.SSLConnection = True + ' oServer.Port = 993 + + ' ' If your server doesn't support SSL/TLS connection, please use the following codes + ' ' oServer.SSLConnection = False + ' ' oServer.Port = 110 + + ' Console.WriteLine("Connecting server ...") + + ' Dim oClient As New MailClient("EG-D1710817841-00027-8F73639A7EE1E54E-7E5AA3751E31F532") + ' oClient.Connect(oServer) + + ' Dim oUIDLManager As UIDLManager = New UIDLManager() + ' oUIDLManager.FindUIDL(oServer, UIDL) + + ' Dim fileName As String = _generateFileName(i + 1) + ' Dim fullPath As String = String.Format("{0}\{1}", localInbox, fileName) + + ' Console.WriteLine("Downloading {0}/{1} ...", i + 1, infos.Length) + ' Dim oMail As Mail = oClient.GetMail(info) + + + ' oClient.GetImap4FolderUID(,) = "UIDL" + ' 'oClient.GetMailInfosParam.BodyContains = "24DE770176692626M6" + ' 'oClient.GetMailInfosParam.SenderContains = "support" + ' oClient.GetMailInfosParam.DateRange.SINCE = System.DateTime.Now.AddMonths(-12) + ' oClient.GetMailInfosParam.DateRange.BEFORE = System.DateTime.Now.AddDays(1) + ' oClient.GetMailInfosParam.DateRange.BEFORE = System.DateTime.Now.AddDays(1) + + + ' Dim infos As MailInfo() = oClient.GetMailInfos(s) + ' Console.WriteLine("Total {0} email(s)", infos.Length) + + ' For i As Integer = 0 To infos.Length - 1 + ' Dim info As MailInfo = infos(i) + ' Console.WriteLine("Index: {0}; Size: {1}; UIDL: {2}", + ' info.Index, info.Size, info.UIDL) + + ' ' Retrieve email from IMAP server + ' Dim oMail As Mail = oClient.GetMail(info) + + ' Console.WriteLine("From: {0}", oMail.From.ToString()) + ' Console.WriteLine("Subject: {0}" & vbCr & vbLf, oMail.Subject) + ' '?? oMail.MAPIConversationId.ToString + ' .Rows.Add({oMail.From.ToString(), oMail.To.ToString(), oMail.Subject, oMail.Attachments.Count, info.UIDL}) + + ' ' Generate an unqiue email file name based on date time. + ' ' Dim fileName As String = _generateFileName(i + 1) + ' ' Dim fullPath As String = String.Format("{0}\{1}", localInbox, fileName) + + ' ' Save email to local disk + ' 'oMail.SaveAs(fullPath, True) + + ' ' Mark email as deleted from POP3 server. + ' '''''' oClient.Delete(info) + + ' Next + + ' ' Quit and expunge emails marked as deleted from POP3 server. + ' oClient.Quit() + ' Console.WriteLine("Completed!") + + ' Catch ep As Exception + ' Console.WriteLine(ep.Message) + ' Console.WriteLine(ep.StackTrace) + ' MsgBox(ep.Message & " - " & ep.StackTrace) + ' End Try + + + 'End Sub + + Public Sub EnumerateFolder(ByVal folders() As Imap4Folder) + For i As Integer = 0 To folders.Length - 1 + Dim folder As Imap4Folder = folders(i) + + Console.WriteLine("Name: {0}", folder.Name) + Console.WriteLine("FullPath: {0}", folder.FullPath) + Console.WriteLine("LocalPath: {0}", folder.LocalPath) + Console.WriteLine("Flags: {0}", folder.IMAP4FolderFlags) + Console.WriteLine("Subscribed: {0}" & vbCrLf, folder.Subscribed) + + EnumerateFolder(folder.SubFolders) + Next + End Sub + Function _generateFileName(ByVal sequence As Integer) As String + Dim currentDateTime As DateTime = DateTime.Now + Return String.Format("{0}-{1:000}-{2:000}.eml", + currentDateTime.ToString("yyyyMMddHHmmss", New CultureInfo("en-US")), + currentDateTime.Millisecond, + sequence) + End Function + + End Class diff --git a/Aviso/packages.config b/Aviso/packages.config index a62226e..002632e 100644 --- a/Aviso/packages.config +++ b/Aviso/packages.config @@ -7,6 +7,7 @@ + @@ -18,12 +19,14 @@ - + - - - + + + + + \ No newline at end of file diff --git a/Aviso/rCntrlVermerke.Designer.vb b/Aviso/rCntrlVermerke.Designer.vb new file mode 100644 index 0000000..19f0dfd --- /dev/null +++ b/Aviso/rCntrlVermerke.Designer.vb @@ -0,0 +1,102 @@ + _ +Partial Class rCntrlVermerke + Inherits System.Windows.Forms.UserControl + + 'UserControl ü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() + 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() + Me.gridVermerke = New System.Windows.Forms.DataGridView() + CType(Me.gridVermerke, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'gridVermerke + ' + Me.gridVermerke.AllowUserToAddRows = False + Me.gridVermerke.AllowUserToDeleteRows = False + Me.gridVermerke.AllowUserToResizeRows = False + DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + Me.gridVermerke.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle2.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle2.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + 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.gridVermerke.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 + Me.gridVermerke.ColumnHeadersHeight = 34 + Me.gridVermerke.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing + DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, 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.gridVermerke.DefaultCellStyle = DataGridViewCellStyle3 + Me.gridVermerke.Dock = System.Windows.Forms.DockStyle.Fill + Me.gridVermerke.Location = New System.Drawing.Point(0, 0) + Me.gridVermerke.MultiSelect = False + Me.gridVermerke.Name = "gridVermerke" + Me.gridVermerke.ReadOnly = True + DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, 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.gridVermerke.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 + Me.gridVermerke.RowHeadersVisible = False + Me.gridVermerke.RowHeadersWidth = 62 + Me.gridVermerke.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing + DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridVermerke.RowsDefaultCellStyle = DataGridViewCellStyle5 + Me.gridVermerke.RowTemplate.Height = 20 + Me.gridVermerke.RowTemplate.ReadOnly = True + Me.gridVermerke.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridVermerke.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect + Me.gridVermerke.ShowCellErrors = False + Me.gridVermerke.ShowRowErrors = False + Me.gridVermerke.Size = New System.Drawing.Size(575, 208) + Me.gridVermerke.TabIndex = 71 + Me.gridVermerke.TabStop = False + ' + 'rCntrlVermerke + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.gridVermerke) + Me.Name = "rCntrlVermerke" + Me.Size = New System.Drawing.Size(575, 208) + CType(Me.gridVermerke, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents gridVermerke As DataGridView +End Class diff --git a/Aviso/rCntrlVermerke.resx b/Aviso/rCntrlVermerke.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Aviso/rCntrlVermerke.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/rCntrlVermerke.vb b/Aviso/rCntrlVermerke.vb new file mode 100644 index 0000000..ed7e10d --- /dev/null +++ b/Aviso/rCntrlVermerke.vb @@ -0,0 +1,177 @@ +Imports VERAG_PROG_ALLGEMEIN + +Public Class rCntrlVermerke + + Dim VermerkArt = 2 + Dim tblSnd_SendungID As Integer = -1 + Dim AVISO As New VERAG_PROG_ALLGEMEIN.cAviso + + Dim VermerkeDAL As New cVermerkeDAL + Private AvisoDAL As New cAvisoDAL + Dim painted As Boolean = False + + Sub init(AVISO, tblSnd_SendungID) + Me.AVISO = AVISO + Me.tblSnd_SendungID = tblSnd_SendungID + Vermerke_anzeigen2() + End Sub + + + Public Sub Vermerke_anzeigen2(Optional rowindex As Integer = -1) + aktiv = Now 'Damit nicht neu geladedt wird (frmHauptfenster -> timer.tick) + gridVermerke.Columns.Clear() + ' lblInfoAviso.Visible = False + infotxt = "" + ' MsgBox("SO") + ' If setAkive_AuswahlID() = -1 Then Exit Sub + If AVISO Is Nothing Then Exit Sub + If AVISO.AvisoID <= 0 Then Exit Sub + + + + + 'Hier werden die passenden Vermerke zum Aviso angezeigt + Dim sendwhere = "" + If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "ATILLA" Then + If gridVermerke.Columns("tblSnd_PosUnterNr") IsNot Nothing Then gridVermerke.Columns("tblSnd_PosUnterNr").Visible = False + Select Case VermerkArt + Case 0 + ' dgvSendungen.ClearSelection() + Case 1 + ' If dgvSendungen.SelectedRows.Count > 0 Then + sendwhere = " AND VermerkArt='A' " + ' End If + + Case 2 + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + + If tblSnd_SendungID > 0 Then + sendwhere = " AND VermerkArt='S' AND SendungID=" & tblSnd_SendungID + + Else + sendwhere = " AND 1=0 " ' 1=0, damit keine Zeile angezeigt wird, wenn keine Sendung ausgewählt + End If + + If gridVermerke.Columns("tblSnd_PosUnterNr") IsNot Nothing Then gridVermerke.Columns("tblSnd_PosUnterNr").Visible = True + + + End Select + + End If + + ' Dim hSQL As String = "SELECT [VermerkID],[AvisoID],[Datum],[Mitarbeiter],[Hinweis_Vermerk],[VermerkeCode],[MitarbeiterId] FROM Vermerke WHERE AvisoID = " & AvisoID & " " & sendwhere & " ORDER BY Datum DESC" + + + Dim hSQL = usrcntlAktDetails.vermerkehSQL + hSQL = hSQL.Replace("[[AvisoId]]", AVISO.AvisoID) + hSQL = hSQL.Replace("[[sendwhere]]", sendwhere) + ' MsgBox(hSQL) + infotxt = AvisoDAL.getAvisoInfo(AVISO.AvisoID) + If infotxt <> "" Then + 'lblInfoAviso.Visible = True + End If + + + gridVermerke.DataSource = VermerkeDAL.Anzeigen_Vermerke(hSQL) + + + If gridVermerke.Columns("VermerkeOptions") Is Nothing Then + Dim dgvlc As New DataGridViewLinkColumn + dgvlc.Name = "VermerkeOptions" + gridVermerke.Columns.Insert(gridVermerke.ColumnCount - 1, dgvlc) + End If + + 'Grid neu designen + 'GridZeichnenBilanz() + usrcntlAktDetails.gridVermerke_SpaltenFestlegen(gridVermerke) + + 'If tbcntlVermerke.SelectedIndex = 2 And rowindex > 0 Then + If rowindex > 0 Then + 'dgvSendungen.ClearSelection() + 'dgvSendungen.Rows(rowindex).Selected = True + Else + gridVermerke.ClearSelection() + End If + ' timer.Enabled = True + ' initDGVSendungenRows() + End Sub + + + Private Sub gridVermerkeMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellEventArgs) Handles gridVermerke.CellContentClick + Dim tmpIndex = -1 + If (tblSnd_SendungID > 0) Then + tmpIndex = tblSnd_SendungID + End If + usrcntlAktDetails.gridVermerkeMouseClick(gridVermerke, e.ColumnIndex, e.RowIndex, AVISO, tmpIndex) + + Vermerke_anzeigen2(tmpIndex) + End Sub + Private Sub gridVermerke_Paint(sender As Object, e As PaintEventArgs) Handles gridVermerke.Paint + If painted Then Exit Sub + painted = False + ' If dgvSendungen.RowCount = 0 Then Exit Sub + usrcntlAktDetails.gridVermerke_Paint(gridVermerke) + painted = True + End Sub + + + 'Sub ArrowDown_ShowHide() + ' picArrowDown.Visible = False + ' If dgvSendungen.RowCount = 0 Then Exit Sub + ' Select Case tbcntlVermerke.SelectedIndex + ' Case 0, 1, 2 + ' Try + ' Dim showFirst = False + ' For Each r As DataGridViewRow In gridVermerke.Rows + ' If r.Displayed Then showFirst = True + ' If showFirst Then + ' If (r.Cells("Hervorheben").Value = "1" Or r.Cells("VermerkeOptions").Value <> "") AndAlso Not r.Displayed Then + ' picArrowDown.Visible = True + ' End If + ' End If + ' Next + ' Catch ex As Exception + ' MsgBox("ERR") + ' End Try + ' End Select + 'End Sub + + + + 'Private Sub conMenu_Click(sender As Object, e As System.EventArgs) Handles conVermerkLöschenNew.Click, conVermerkEntgLöschen.Click + + ' If gridVermerke.SelectedRows.Count = 0 Then Exit Sub + + ' If sender Is conVermerkEntgLöschen Then + + ' If vbNo = MsgBox("Wollen Sie den ausgewählten entgültig Vermerk löschen?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle), "Vermerk löschen") Then + ' Exit Sub + ' End If + + ' If gridVermerke.SelectedRows(0).Cells("Hinweis_Vermerk").Value.ToString.EndsWith("wurde gelöscht.") Then 'Vermerk, dass Sendung gelöscht wurde. + ' Exit Sub + ' End If + ' Dim index As Integer = -1 + ' If (dgvSendungen.SelectedRows.Count > 0) Then index = dgvSendungen.SelectedRows(0).Index + ' VermerkeDAL.LöschenVermerk(CInt(gridVermerke.SelectedRows(0).Cells("VermerkID").Value)) + ' Vermerke_anzeigen(index) + + ' ElseIf sender Is conVermerkLöschenNew Then + + ' If vbNo = MsgBox("Wollen Sie den ausgewählten Vermerk löschen?", CType(MsgBoxStyle.YesNo + MsgBoxStyle.Exclamation, MsgBoxStyle), "Vermerk löschen") Then + ' Exit Sub + ' End If + ' Dim index As Integer = -1 + ' If (dgvSendungen.SelectedRows.Count > 0) Then index = dgvSendungen.SelectedRows(0).Index + ' VermerkeDAL.togglegeloescht(CInt(gridVermerke.SelectedRows(0).Cells("VermerkID").Value)) + ' Vermerke_anzeigen(index) + ' End If + + + + + 'End Sub + + +End Class diff --git a/Aviso/usrcntlAktDetails.vb b/Aviso/usrcntlAktDetails.vb index a5a38d7..cb27655 100644 --- a/Aviso/usrcntlAktDetails.vb +++ b/Aviso/usrcntlAktDetails.vb @@ -414,7 +414,7 @@ Public Class usrcntlAktDetails Return "" End Function - Private Sub gridVermerke_SpaltenFestlegen() + Shared Sub gridVermerke_SpaltenFestlegen(gridVermerke As DataGridView) If gridVermerke.RowCount = 0 Then gridVermerke.Columns.Clear() : Exit Sub With gridVermerke @@ -860,7 +860,12 @@ Public Class usrcntlAktDetails End Sub - + Public Shared vermerkehSQL As String = " SELECT TOP 1000 [VermerkID],[AvisoID], [SendungID],[VermerkeCode], [Datum],[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Hervorheben,Geloescht," & + " CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,25,28,29,30,35,46,47,94,101,102) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId,SMSId,VermerkIDAufgehoben" & + " FROM [Vermerke] LEFT JOIN VermerkeCodes ON [VermerkeCode]=VermerkeCodes.VermerkCodeId " & + " LEFT JOIN tblSendungen ON [SendungID]=tblSendungen.tblSnd_SendungID " & + " WHERE AvisoID = [[AvisoId]] [[sendwhere]] " & + " order by /*VermerkArt ASC,tblSnd_PosUnterNr,*/Datum DESC " Private Sub Vermerke_anzeigen2(Optional rowindex As Integer = -1) If Not loaded Then Exit Sub aktiv = Now 'Damit nicht neu geladedt wird (frmHauptfenster -> timer.tick) @@ -994,12 +999,9 @@ Public Class usrcntlAktDetails ' Dim hSQL As String = "SELECT [VermerkID],[AvisoID],[Datum],[Mitarbeiter],[Hinweis_Vermerk],[VermerkeCode],[MitarbeiterId] FROM Vermerke WHERE AvisoID = " & AvisoID & " " & sendwhere & " ORDER BY Datum DESC" - Dim hSQL As String = " SELECT TOP 1000 [VermerkID],[AvisoID], [SendungID],[VermerkeCode], [Datum],[MitarbeiterId],tblSendungen.tblSnd_PosUnterNr,Hervorheben,Geloescht," & - " CASE WHEN VermerkeCode IS NULL OR VermerkeCode IN (13,25,28,29,30,35,46,47,94,101,102) THEN Hinweis_Vermerk ELSE VermerkeCodes.Bezeichnung END as [Hinweis_Vermerk_Anzeige],[Hinweis_Vermerk], tblSendungen.tblSnd_Empfaenger ,[Mitarbeiter],VorauskasseId,SMSId,VermerkIDAufgehoben" & - " FROM [Vermerke] LEFT JOIN VermerkeCodes ON [VermerkeCode]=VermerkeCodes.VermerkCodeId " & - " LEFT JOIN tblSendungen ON [SendungID]=tblSendungen.tblSnd_SendungID " & - " WHERE AvisoID = " & AvisoID & " " & sendwhere & " " & - " order by /*VermerkArt ASC,tblSnd_PosUnterNr,*/Datum DESC " + Dim hSQL = usrcntlAktDetails.vermerkehSQL + hSQL = hSQL.Replace("[[AvisoId]]", AvisoID) + hSQL = hSQL.Replace("[[sendwhere]]", sendwhere) infotxt = AvisoDAL.getAvisoInfo(AvisoID) @@ -1019,7 +1021,7 @@ Public Class usrcntlAktDetails 'Grid neu designen 'GridZeichnenBilanz() - gridVermerke_SpaltenFestlegen() + usrcntlAktDetails.gridVermerke_SpaltenFestlegen(gridVermerke) 'If tbcntlVermerke.SelectedIndex = 2 And rowindex > 0 Then If rowindex > 0 Then @@ -1034,269 +1036,281 @@ Public Class usrcntlAktDetails Private Sub gridVermerkeMouseClick(sender As Object, e As System.Windows.Forms.DataGridViewCellEventArgs) Handles gridVermerke.CellContentClick + Dim tmpIndex = -1 + If (dgvSendungen.SelectedRows.Count > 0) Then + tmpIndex = dgvSendungen.SelectedRows(0).Index + End If + gridVermerkeMouseClick(gridVermerke, e.ColumnIndex, e.RowIndex, AVISO, tmpIndex) + loaded = False + ' Dim tmpIndex = -1 + If init Then + ' If (dgvSendungen.SelectedRows.Count > 0) Then + ' tmpIndex = dgvSendungen.SelectedRows(0).Index + 'End If + sendAktiv = False + initDgvSendungen() + sendAktiv = True + 'dgvSendungen.ClearSelection() + 'If tmpIndex > 0 And dgvSendungen.RowCount > tmpIndex Then + ' dgvSendungen.Rows(tmpIndex).Selected = True + 'End If + + End If + loaded = True + Vermerke_anzeigen(tmpIndex) + End Sub + + Shared Sub gridVermerkeMouseClick(gridVermerke, ColumnIndex, RowIndex, AVISO, sendungsId) If gridVermerke.RowCount = 0 Then Exit Sub + Dim AvisoStatusFunctions As New AvisoStatusFunctions + If gridVermerke.Columns(ColumnIndex).Name = "VermerkeOptions" Then - If gridVermerke.Columns(e.ColumnIndex).Name = "VermerkeOptions" Then - Dim tmpIndex = -1 - If (dgvSendungen.SelectedRows.Count > 0) Then - tmpIndex = dgvSendungen.SelectedRows(0).Index - End If - Dim VermekId = gridVermerke.Rows(e.RowIndex).Cells("VermerkID").Value + Dim VermekId = gridVermerke.Rows(RowIndex).Cells("VermerkID").Value Dim VermerkeDAL As New cVermerkeDAL Dim myVermerk As cVermerk = VermerkeDAL.LesenVermerk(VermekId, "") myVermerk.VermerkID = 0 - 'myVermerk.AvisoID = CInt(gridVermerke.Rows(e.RowIndex).Cells(1).Value) + 'myVermerk.AvisoID = CInt(gridVermerke.Rows(RowIndex).Cells(1).Value) myVermerk.Datum = Now myVermerk.Mitarbeiter = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.Mitarbeiter myVermerk.MitarbeiterId = VERAG_PROG_ALLGEMEIN.cGlobal.AktiverMitarbeiter.MitarbeiterID Dim init As Boolean = False - Select Case CStr(gridVermerke.Rows(e.RowIndex).Cells("VermerkeCode").Value) + Select Case CStr(gridVermerke.Rows(RowIndex).Cells("VermerkeCode").Value) Case "1" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 2 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex) + init = True 'Vermerke_anzeigen(RowIndex) ' initDgvSendungen() Case "3" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 4 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "5" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 6 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "7" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 8 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "9" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 10 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "11" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 12 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "90" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 93 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "13" If VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA <> "VERAG" OrElse VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG_bool("AVISO_Vermerk_VKErhalten", "AVISO") Then - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 14 - If gridVermerke.Rows(e.RowIndex).Cells("VorauskasseId").Value IsNot DBNull.Value Then - myVermerk.VorauskasseId = gridVermerke.Rows(e.RowIndex).Cells("VorauskasseId").Value + If gridVermerke.Rows(RowIndex).Cells("VorauskasseId").Value IsNot DBNull.Value Then + myVermerk.VorauskasseId = gridVermerke.Rows(RowIndex).Cells("VorauskasseId").Value End If Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Else MsgBox("Keine Berechtigung. Bitte wenden Sie sich an die Buchhaltung oder Abteilungsleitung.") End If Case "17" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("eingereicht", "fertig") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("eingereicht", "fertig") myVermerk.VermerkCodeId = 18 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) VermerkeDAL.UpdateLKW(myVermerk.AvisoID, False) ' avisoAktualisierenAktiveIdBehalten(myVermerk.AvisoID) 'Vermerke_aktualisieren() - init = True ' Vermerke_anzeigen(e.RowIndex) + init = True ' Vermerke_anzeigen(RowIndex) Case "19" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("eingereicht", "fertig") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("eingereicht", "fertig") myVermerk.VermerkCodeId = 20 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "25" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 30 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "31" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("in Vorbereitung", "Vorbereitung abgeschl.") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("in Vorbereitung", "Vorbereitung abgeschl.") myVermerk.VermerkCodeId = 32 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "33" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 34 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "46" - MsgBox("SMS " & gridVermerke.Rows(e.RowIndex).Cells("VermerkeOptions").ToolTipText) - init = False 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + MsgBox("SMS " & gridVermerke.Rows(RowIndex).Cells("VermerkeOptions").ToolTipText) + init = False 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "36" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 37 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "53" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 54 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "55" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 56 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "57" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 58 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "74" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 75 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "76" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 77 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "80" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("folgt", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("folgt", "erhalten") myVermerk.VermerkCodeId = 81 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() + 'Ankunft If vbYes = MsgBox("Soll der LKW auf Status 'ANKUNFT' gesetzt werden?", vbYesNoCancel) Then - If FUNC.setAnkunft(AvisoID) Then + If AvisoStatusFunctions.setAnkunft(AVISO.AvisoID) Then frmHauptfenster.avisoAktualisierenAktiveIdBehalten(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) frmHauptfenster.Details_anzeigen(VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID) End If End If Case "82" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("eingereicht", "fertig") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("eingereicht", "fertig") myVermerk.VermerkCodeId = 83 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) VermerkeDAL.UpdateLKW(myVermerk.AvisoID, False) Dim sql As New VERAG_PROG_ALLGEMEIN.SQL - sql.doSQL("UPDATE AVISO SET ZOLLDigitalEingereicht=0, LKW_fertig=1 where avisoid=" & AvisoID, "AVISO") + sql.doSQL("UPDATE AVISO SET ZOLLDigitalEingereicht=0, LKW_fertig=1 where avisoid=" & AVISO.AvisoID, "AVISO") AvisoStatusFunctions.printFinish(AVISO) ' avisoAktualisierenAktiveIdBehalten(myVermerk.AvisoID) 'Vermerke_aktualisieren() - init = True ' Vermerke_anzeigen(e.RowIndex) + init = True ' Vermerke_anzeigen(RowIndex) Case "96" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 97 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "101" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("offen", "erledigt") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("offen", "erledigt") myVermerk.VermerkCodeId = 102 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "103" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 104 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "105" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 106 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() Case "107" - myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(e.RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") + myVermerk.Hinweis_Vermerk = CStr(gridVermerke.Rows(RowIndex).Cells("Hinweis_Vermerk").Value).Replace("angefordert", "erhalten") myVermerk.VermerkCodeId = 108 Dim IdTmp = VermerkeDAL.SpeichernVermerk(myVermerk) VermerkeDAL.SpeichernVermerkIDAufgehoben(VermekId, IdTmp) - init = True 'Vermerke_anzeigen(e.RowIndex)': initDgvSendungen() + init = True 'Vermerke_anzeigen(RowIndex)': initDgvSendungen() End Select - loaded = False - ' Dim tmpIndex = -1 - If init Then - ' If (dgvSendungen.SelectedRows.Count > 0) Then - ' tmpIndex = dgvSendungen.SelectedRows(0).Index - 'End If - sendAktiv = False - initDgvSendungen() - sendAktiv = True - 'dgvSendungen.ClearSelection() - 'If tmpIndex > 0 And dgvSendungen.RowCount > tmpIndex Then - ' dgvSendungen.Rows(tmpIndex).Selected = True - 'End If - End If - loaded = True - Vermerke_anzeigen(tmpIndex) End If End Sub Private Sub gridVermerke_Paint(sender As Object, e As PaintEventArgs) Handles gridVermerke.Paint - If painted Then Exit Sub If dgvSendungen.RowCount = 0 Then Exit Sub + gridVermerke_Paint(gridVermerke) + painted = True + End Sub + Shared Sub gridVermerke_Paint(gridvermerke As DataGridView) + + Try - If gridVermerke.Columns("VermerkeOptions") Is Nothing Then Exit Sub - For Each r As DataGridViewRow In gridVermerke.Rows + If gridvermerke.Columns("VermerkeOptions") Is Nothing Then Exit Sub + For Each r As DataGridViewRow In gridvermerke.Rows ' If r.Cells("VermerkeOptions").GetType.Name = "DataGridViewLinkCell" Then Dim optionCell As DataGridViewLinkCell = DirectCast(r.Cells("VermerkeOptions"), DataGridViewLinkCell) If CBool(r.Cells("Hervorheben").Value) Then @@ -1305,43 +1319,43 @@ Public Class usrcntlAktDetails r.DefaultCellStyle.BackColor = Color.Yellow End If If CBool(r.Cells("Geloescht").Value) Then - r.DefaultCellStyle.Font = New Font(Me.Font.FontFamily, Me.Font.Size, FontStyle.Strikeout) + r.DefaultCellStyle.Font = New Font(gridvermerke.Font.FontFamily, gridvermerke.Font.Size, FontStyle.Strikeout) End If If (r.Cells("VermerkeCode").Value) IsNot DBNull.Value Then Select Case CInt(r.Cells("VermerkeCode").Value) Case 1 - If Not existCodeInGridVermerke(2, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 2, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Auftrag erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Auftrag erhalten' einzutragen." End If Case 3 - If Not existCodeInGridVermerke(4, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 4, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Rechnung erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Rechnung erhalten' einzutragen." End If Case 5 - If Not existCodeInGridVermerke(6, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 6, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "LS erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'LS erhalten' einzutragen." End If Case 7 - If Not existCodeInGridVermerke(8, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 8, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "ATR erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'ATR erhalten' einzutragen." End If Case 9 - If Not existCodeInGridVermerke(10, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 10, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Vollmacht erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vollmacht erhalten' einzutragen." End If Case 11 - If Not existCodeInGridVermerke(12, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 12, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "CMR erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'CMR erhalten' einzutragen." End If Case 90 - If Not existCodeInGridVermerke(93, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 93, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Packliste erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Packliste erhalten' einzutragen." End If @@ -1350,43 +1364,43 @@ Public Class usrcntlAktDetails If r.Cells("VorauskasseId").Value IsNot DBNull.Value Then - If Not existCodeInGridVermerke_VK(r.Cells("VorauskasseId").Value) Then + If Not existCodeInGridVermerke_VK(gridvermerke, r.Cells("VorauskasseId").Value) Then optionCell.Value = "Vorauskasse erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vorauskasse erhalten' einzutragen." End If Else - If Not existCodeInGridVermerke_VK_OLD(r.Cells("SendungID").Value) Then + If Not existCodeInGridVermerke_VK_OLD(gridvermerke, r.Cells("SendungID").Value) Then optionCell.Value = "Vorauskasse erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vorauskasse erhalten' einzutragen." End If End If Case 17 - If Not existCodeInGridVermerke(18) Then + If Not existCodeInGridVermerke(gridvermerke, 18) Then optionCell.Value = "DE-ZOLL fertig" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'DE-ZOLL fertig' einzutragen." End If Case 19 - If Not existCodeInGridVermerke(20) Then + If Not existCodeInGridVermerke(gridvermerke, 20) Then optionCell.Value = "AT-ZOLL fertig" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'AT-ZOLL fertig' einzutragen." End If Case 25 - If Not existCodeInGridVermerke(30, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 30, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Dokument erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Dokument erhalten' einzutragen." End If Case 31 - If Not existCodeInGridVermerke(32, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 32, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Vorbereitung abgeschlossen" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Vorbereitung abgeschlossen' einzutragen." End If Case 33 - If Not existCodeInGridVermerke(34, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 34, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "ATA-Nr. erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'ATA-Nr. erhalten' einzutragen." End If Case 36 - If Not existCodeInGridVermerke(37, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 37, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Kontaktdaten erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Kontaktdaten erhalten' einzutragen." End If @@ -1417,52 +1431,52 @@ Public Class usrcntlAktDetails optionCell.ToolTipText = "Sendefehler: " & SMS.sms_Failure optionCell.LinkColor = Color.Red optionCell.Style.BackColor = Color.PapayaWhip - optionCell.Style.Font = New Font(Me.Font.FontFamily, Me.Font.Size, FontStyle.Bold) + optionCell.Style.Font = New Font(gridvermerke.Font.FontFamily, gridvermerke.Font.Size, FontStyle.Bold) 'optionCell.LinkColor = Color.White 'optionCell.Style.SelectionBackColor = optionCell.Style.BackColor End Select End If Case 53 - If Not existCodeInGridVermerke(54, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 54, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Ü-Dok erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Ü-Dok erhalten' einzutragen." End If Case 55 - If Not existCodeInGridVermerke(56, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 56, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Rg-Best. erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Rg-Best. erhalten' einzutragen." End If Case 57 - If Not existCodeInGridVermerke(58, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 58, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Dispoliste erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Dispoliste erhalten' einzutragen." End If Case 74 - If Not existCodeInGridVermerke(75, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 75, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Frachtkosten erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Frachtkosten erhalten' einzutragen." End If Case 76 - If Not existCodeInGridVermerke(77, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 77, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Absend.best. erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Absenderbestätigung erhalten' einzutragen." End If Case 96 - If Not existCodeInGridVermerke(97, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 97, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "T1 Bestätigung erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'T1 Bestätigung erhalten' einzutragen." End If Case 80 - If Not existCodeInGridVermerke(81, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 81, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "ATB-Nr. erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'ATB-Nr. erhalten' einzutragen." End If Case 82 - If Not existCodeInGridVermerke(83) Then + If Not existCodeInGridVermerke(gridvermerke, 83) Then optionCell.Value = "DE-ZOLL fertig" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'DE-ZOLL (DIGITAL) fertig' einzutragen." End If @@ -1470,22 +1484,22 @@ Public Class usrcntlAktDetails Case 101 If r.Cells("VermerkIDAufgehoben").Value Is DBNull.Value Then - ' If Not existCodeInGridVermerke(102, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + ' If Not existCodeInGridVermerke(gridvermerke ,102, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Erledigt" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Sonstiger Grund erledigt' einzutragen." End If Case 103 - If Not existCodeInGridVermerke(104, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 104, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Gewicht/Packstücke erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Gewicht/Packstücke erhalten' einzutragen." End If Case 105 - If Not existCodeInGridVermerke(106, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 106, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Zolltarifnummer erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Zolltarifnummer erhalten' einzutragen." End If Case 107 - If Not existCodeInGridVermerke(108, CStr(r.Cells("Hinweis_Vermerk").Value)) Then + If Not existCodeInGridVermerke(gridvermerke, 108, CStr(r.Cells("Hinweis_Vermerk").Value)) Then optionCell.Value = "Kostenbestätigung erhalten" optionCell.ToolTipText = "Klicken Sie hier, um den Vermerk 'Kostenbestätigung erhalten' einzutragen." End If @@ -1494,7 +1508,7 @@ Public Class usrcntlAktDetails Next - painted = True + ' ArrowDown_ShowHide() 'Anzeigeproblem, wenn Aviso minimiert wird! --> Jetzt bei Timer! Catch ex As Exception @@ -1523,7 +1537,7 @@ Public Class usrcntlAktDetails End Select End Sub - Function existCodeInGridVermerke(code As Integer, Optional text As String = "") As Boolean + Shared Function existCodeInGridVermerke(gridVermerke As DataGridView, code As Integer, Optional text As String = "") As Boolean For Each r As DataGridViewRow In gridVermerke.Rows If r.Cells("Geloescht").Value = False Then @@ -1549,7 +1563,7 @@ Public Class usrcntlAktDetails End Function - Function existCodeInGridVermerke_VK(VorauskasseId As Object) As Boolean + Shared Function existCodeInGridVermerke_VK(gridVermerke As DataGridView, VorauskasseId As Object) As Boolean For Each r As DataGridViewRow In gridVermerke.Rows If r.Cells("Geloescht").Value = False Then @@ -1565,7 +1579,7 @@ Public Class usrcntlAktDetails End Function - Function existCodeInGridVermerke_VK_OLD(SendungID As Object) As Boolean + Shared Function existCodeInGridVermerke_VK_OLD(gridVermerke As DataGridView, SendungID As Object) As Boolean For Each r As DataGridViewRow In gridVermerke.Rows Select Case If(DirectCast(r.Cells("VermerkeCode"), DataGridViewTextBoxCell).Value.ToString, "")