From 6494cc6829052ec949a0c5e38267164349f92477 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Sat, 2 Nov 2024 22:19:30 +0100 Subject: [PATCH] AAS, BenachrichtungenLayout, unboundSnd --- Aviso/Aviso.vbproj | 1 + .../usrCntlBenachrichtigungen.vb | 22 ++ Aviso/Classes/cSendungsoptions.vb | 2 +- Aviso/My Project/AssemblyInfo.vb | 4 +- Aviso/My Project/Resources.Designer.vb | 10 + Aviso/My Project/Resources.resx | 3 + Aviso/Resources/reminder.png | Bin 0 -> 2087 bytes Aviso/frmHauptfenster.Designer.vb | 370 ++++++++++++------ Aviso/frmHauptfenster.resx | 11 + Aviso/frmHauptfenster.vb | 37 +- Aviso/frmSendungsdetailsNEU.vb | 41 +- Aviso/usrCntlSND_ATBGestellung.Designer.vb | 46 ++- Aviso/usrCntlSND_ATBGestellung.vb | 34 +- Diverses/remind-4-32.png | Bin 0 -> 707 bytes Diverses/reminder.png | Bin 0 -> 2087 bytes Gemeinsames/rptSendungen.vb | 8 +- 16 files changed, 427 insertions(+), 162 deletions(-) create mode 100644 Aviso/Resources/reminder.png create mode 100644 Diverses/remind-4-32.png create mode 100644 Diverses/reminder.png diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 07bd4c2..d9190bc 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -1679,6 +1679,7 @@ + Always diff --git a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb index d410f3d..534f3c6 100644 --- a/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb +++ b/Aviso/Benachrichtigung/usrCntlBenachrichtigungen.vb @@ -189,6 +189,8 @@ Public Class usrCntlBenachrichtigungen If r.Cells("ab_BenachrichtigungCode").Value = "6" Then r.Cells("ab_Art").Value = "VK" End If + + Next '.Width = gridAviso.Width - gridVermerke.Width @@ -205,6 +207,26 @@ Public Class usrCntlBenachrichtigungen End Sub + Private Sub gridAvisoBenachrichtigungen_CellPainting(sender As Object, e As DataGridViewCellPaintingEventArgs) Handles gridAvisoBenachrichtigungen.CellPainting + If e.RowIndex <> -1 AndAlso gridAvisoBenachrichtigungen.Columns(e.ColumnIndex).Name = "ab_Art" Then + If gridAvisoBenachrichtigungen.Rows(e.RowIndex).Cells("ab_Beschreibung").Value.ToString.Contains("AAS:") Then + If (e.PaintParts And DataGridViewPaintParts.Background) <> DataGridViewPaintParts.None Then + e.Graphics.DrawImage(My.Resources.reminder, e.CellBounds) + 'e.CellStyle.BackColor = Color.White + gridAvisoBenachrichtigungen.Rows(e.RowIndex).Cells("ab_Art").Value = "" + gridAvisoBenachrichtigungen.Rows(e.RowIndex).Cells("ab_Art").Style.BackColor = Color.Gray + End If + + + If Not e.Handled Then + e.Handled = True + e.PaintContent(e.CellBounds) + End If + End If + End If + + End Sub + Private Sub usrCntlBenachrichtigungen_Load(sender As Object, e As EventArgs) Handles Me.Load 'MyComboBox2.Items.Clear() diff --git a/Aviso/Classes/cSendungsoptions.vb b/Aviso/Classes/cSendungsoptions.vb index 478db1d..3425bc9 100644 --- a/Aviso/Classes/cSendungsoptions.vb +++ b/Aviso/Classes/cSendungsoptions.vb @@ -165,7 +165,7 @@ Public Class SendungOptions Dim imgQR As Image = Nothing If SENDUNG.tblSnd_Abfertigungsart_ID.ToString = "44" Then - imgQR = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID)) + imgQR = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://verwahrung.app.verag.ag/upload?avisoid=" & AVISO.AvisoID & "&sendungsid=" & SENDUNG.tblSnd_SendungID) 'imgQR = VERAG_PROG_ALLGEMEIN.cProgramFunctions.getQRCode("https://login.verag.ag/status.aspx?AvisoId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(AVISO.AvisoID) & "&SendungId=" & VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(SENDUNG.tblSnd_SendungID)) End If If barcode IsNot Nothing Then VALUES.imgQR = imgQR diff --git a/Aviso/My Project/AssemblyInfo.vb b/Aviso/My Project/AssemblyInfo.vb index b1fa143..b6d53ae 100644 --- a/Aviso/My Project/AssemblyInfo.vb +++ b/Aviso/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Aviso/My Project/Resources.Designer.vb b/Aviso/My Project/Resources.Designer.vb index 4ee09de..43fca1a 100644 --- a/Aviso/My Project/Resources.Designer.vb +++ b/Aviso/My Project/Resources.Designer.vb @@ -1338,6 +1338,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Public ReadOnly Property reminder() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("reminder", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/Aviso/My Project/Resources.resx b/Aviso/My Project/Resources.resx index 2db26fa..6f01836 100644 --- a/Aviso/My Project/Resources.resx +++ b/Aviso/My Project/Resources.resx @@ -691,4 +691,7 @@ ..\Resources\ambar_boarder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\reminder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Aviso/Resources/reminder.png b/Aviso/Resources/reminder.png new file mode 100644 index 0000000000000000000000000000000000000000..618ac722d189ce2fc0ab7932e8848f206b3ed2f9 GIT binary patch literal 2087 zcmaJ?dpJ~iAD=?6SLm|SXi;XzRsPHZ7}-kfgF~a(Q@(gf>>S2wADEl-#nTP5b`wde8Hm^SeBs&*yvlJkLpIdom65 zjP(!*gn^qY-CMJgG%s3rrRMvH_H&eG`Bdq`Rr*MUN);%F5KaOq4???%K@sE)fr99L zEsz5Op|uU>aFtw^2Zb*c?!yzS_2Z>+_74y9M7YrH}P%*yN zECNeLgF<1~7&+t<x!Vh6NN`D>|L*Y)2!Lt;s~93xmAF zmQ1%L6KEuBYnrW#?Gl$RT&u}l-04$0vtNWhRw#pw4%Q{d%u zaavaI16QzoF3!tx0ZlT%;%NVC)Js{ zcM!MkEE+qXzV|5c-d871aCq(q)@Iyiuzf9aLjC>qbNsVwWWuIXTGcv(P%pJ0)3KsL z)G3=r`{o*U1))9B?S9{*&+qTrxXg zJS}WBZ%sa(_k~+K!Y$-@8A=>GnpH3HGv_jcE&8*fbuQlIac$cj4Gh1m^CR^3eOJyX zJAKi7|OVw%CLqx2${eO`Xsr>i&A8 zt2vUeFszr+y>~VC8U3f@TgD|1nuqkuCQBa%c+%2iD;i<}zi$OC<9GcHZGJFp9WI;c ze`*++H+!{XC@SW1P=4Bf^d6;eIka0}PndasODojTu_tyW>6iX|y;BKA>iCQ@f5UFk z=;MTaH>}DUe|;G^HZo|yGs?%^+1hJde|Y_8bBdrdvpt0;sFBb_PU(f{@nA^|)`i<^ z=s<92Gy*0J*u9-S_TMw_Z$F=GvLT(Bpm*#xQS{(yTB3Ef93k>I*ps}eT^Wh4*u zH`XZAfl!RXP&%`J5s3Y?ri7i+w-FHhF;>WZ4q_a*y+jYwC~GD zI$hPCNPJb-=L1ME#kvUlT5tC2+o;FnL0EqB=;|)GbWP%M(RM7h>SEaHY!Az*A4Rn$ z{nvYZUSC`2^4aA6DEZZ<`t25HWrO8YwS$VA&kw(gtPa;M2rV&Nl}c+KD8m6^x_qkH z0gueglevQGiPL`6*n!=D)Xb%48to12)E%B*kvq`qp20Le+~J-N?86yjI-%;or<;H0 z{khJZQI66YJGKc$J+*&r$C((11~>(c#25oRt){9tW|wMHiW=6g+#I|TaddUSWiIy< zVy;I=j-fyDRXnV9v1-_?IIkE#_C>R4CJU8uqJ7Pr4(8maxa#<#k=$qBy~=4aNUH4p z@y(TlBgmUJo>89shu!R~xYMJ}JZ((=IrWTM;k%Gb^eq1K!SAoNs(0C?8reCoD>a?c z9zQskUpoClw0Z2-baMj()et+Mdh_elyq_$yUHr`VN2fB~H?~h2_IhlrKTOr>fL$9> zz9km7N!GIkq_%X)wl~r=Z&yxUV^h{=fx$wu_dZH1Trel9vu(q4ZA+BQ6z5d{h4oCz z-UD7u%E?0cke6`d@B)AGXX?aBe1L+3ei;{v$$vcau;}ijaK!1%Pg99yFaC%SV^QZV zC`jCI^Y1EP9_eZ6@rgB~_huIeEmvk^K;{B{MsEQXg1Fmtt>oXFiN}k-ZZ{WC`X%R( GgMR@st79er literal 0 HcmV?d00001 diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index 3647d5e..c4cb014 100644 --- a/Aviso/frmHauptfenster.Designer.vb +++ b/Aviso/frmHauptfenster.Designer.vb @@ -24,15 +24,15 @@ Partial Class frmHauptfenster Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmHauptfenster)) - Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() - Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Me.mnuInfo = New System.Windows.Forms.ToolStripMenuItem() Me.conÜbernehmen = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -239,6 +239,7 @@ Partial Class frmHauptfenster Me.Label6 = New System.Windows.Forms.Label() Me.txtSuche = New System.Windows.Forms.TextBox() Me.Top = New System.Windows.Forms.Panel() + Me.Button1 = New System.Windows.Forms.Button() Me.lblUsrname = New System.Windows.Forms.Label() Me.lblFimaAviso = New System.Windows.Forms.Label() Me.Button11 = New System.Windows.Forms.Button() @@ -398,8 +399,16 @@ Partial Class frmHauptfenster Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() - Me.Button1 = New System.Windows.Forms.Button() + Me.pnlLeft = New System.Windows.Forms.Panel() Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen() + Me.UsrCntlBenachrichtigungen2 = New AVISO.usrCntlBenachrichtigungen() + Me.Panel5 = New System.Windows.Forms.Panel() + Me.Panel7 = New System.Windows.Forms.Panel() + Me.Button7 = New System.Windows.Forms.Button() + Me.TabControl1 = New System.Windows.Forms.TabControl() + Me.tbSndAlle = New System.Windows.Forms.TabPage() + Me.tbSndOffen = New System.Windows.Forms.TabPage() + Me.tbSndFreigegeben = New System.Windows.Forms.TabPage() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.pnlDetailsRechts.SuspendLayout() @@ -441,6 +450,8 @@ Partial Class frmHauptfenster Me.Panel3.SuspendLayout() Me.Panel4.SuspendLayout() Me.cntVerag.SuspendLayout() + Me.pnlLeft.SuspendLayout() + Me.TabControl1.SuspendLayout() Me.SuspendLayout() ' 'mnuInfo @@ -539,7 +550,7 @@ Partial Class frmHauptfenster Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProgramm, Me.FunktionenToolStripMenuItem, Me.StatistikToolStripMenuItem, Me.ToolStripFormulare, Me.mnuFragezeichen, Me.BREXITToolStripMenuItem}) Me.MenuStrip1.Location = New System.Drawing.Point(0, 0) Me.MenuStrip1.Name = "MenuStrip1" - Me.MenuStrip1.Size = New System.Drawing.Size(1372, 25) + Me.MenuStrip1.Size = New System.Drawing.Size(1202, 25) Me.MenuStrip1.TabIndex = 3 Me.MenuStrip1.Text = "MenuStrip1" ' @@ -1735,7 +1746,7 @@ Partial Class frmHauptfenster Me.pnlDetailsRechts.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlDetailsRechts.Location = New System.Drawing.Point(0, 0) Me.pnlDetailsRechts.Name = "pnlDetailsRechts" - Me.pnlDetailsRechts.Size = New System.Drawing.Size(550, 598) + Me.pnlDetailsRechts.Size = New System.Drawing.Size(299, 598) Me.pnlDetailsRechts.TabIndex = 0 ' 'lblMitarbeiter @@ -1745,7 +1756,7 @@ Partial Class frmHauptfenster Me.lblMitarbeiter.BackColor = System.Drawing.SystemColors.Control Me.lblMitarbeiter.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.lblMitarbeiter.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.lblMitarbeiter.Location = New System.Drawing.Point(366, -38) + Me.lblMitarbeiter.Location = New System.Drawing.Point(366, -63) Me.lblMitarbeiter.Name = "lblMitarbeiter" Me.lblMitarbeiter.Size = New System.Drawing.Size(126, 13) Me.lblMitarbeiter.TabIndex = 1 @@ -1800,6 +1811,16 @@ Partial Class frmHauptfenster Me.Top.Size = New System.Drawing.Size(1372, 52) Me.Top.TabIndex = 6 ' + 'Button1 + ' + Me.Button1.Location = New System.Drawing.Point(1028, 7) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(75, 23) + Me.Button1.TabIndex = 87 + Me.Button1.Text = "Button1" + Me.Button1.UseVisualStyleBackColor = True + Me.Button1.Visible = False + ' 'lblUsrname ' Me.lblUsrname.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -2079,7 +2100,7 @@ Partial Class frmHauptfenster Me.lblDauer.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.lblDauer.BackColor = System.Drawing.Color.Transparent Me.lblDauer.ForeColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer)) - Me.lblDauer.Location = New System.Drawing.Point(0, 195) + Me.lblDauer.Location = New System.Drawing.Point(2, 283) Me.lblDauer.Name = "lblDauer" Me.lblDauer.Size = New System.Drawing.Size(155, 17) Me.lblDauer.TabIndex = 2 @@ -2282,28 +2303,28 @@ Partial Class frmHauptfenster ' Me.SplitContainer2.Panel1.BackColor = System.Drawing.SystemColors.Control Me.SplitContainer2.Panel1.Controls.Add(Me.pnlLinks) - Me.SplitContainer2.Panel1.Controls.Add(Me.pnlLinksOben) Me.SplitContainer2.Panel1MinSize = 164 ' 'SplitContainer2.Panel2 ' Me.SplitContainer2.Panel2.Controls.Add(Me.SplitContainer3) - Me.SplitContainer2.Size = New System.Drawing.Size(815, 300) + Me.SplitContainer2.Size = New System.Drawing.Size(720, 300) Me.SplitContainer2.SplitterDistance = 164 Me.SplitContainer2.SplitterWidth = 1 Me.SplitContainer2.TabIndex = 0 ' 'pnlLinks ' + Me.pnlLinks.Controls.Add(Me.Panel2) Me.pnlLinks.Controls.Add(Me.Label20) + Me.pnlLinks.Controls.Add(Me.pnlLinksOben) + Me.pnlLinks.Controls.Add(Me.lblDauer) Me.pnlLinks.Controls.Add(Me.picAVISOMessenger) Me.pnlLinks.Controls.Add(Me.pic) - Me.pnlLinks.Controls.Add(Me.lblDauer) - Me.pnlLinks.Controls.Add(Me.Panel2) Me.pnlLinks.Dock = System.Windows.Forms.DockStyle.Fill - Me.pnlLinks.Location = New System.Drawing.Point(0, 86) + Me.pnlLinks.Location = New System.Drawing.Point(0, 0) Me.pnlLinks.Name = "pnlLinks" - Me.pnlLinks.Size = New System.Drawing.Size(164, 214) + Me.pnlLinks.Size = New System.Drawing.Size(164, 300) Me.pnlLinks.TabIndex = 0 ' 'Label20 @@ -2312,7 +2333,7 @@ Partial Class frmHauptfenster Me.Label20.BackColor = System.Drawing.Color.Red Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label20.ForeColor = System.Drawing.Color.White - Me.Label20.Location = New System.Drawing.Point(49, 167) + Me.Label20.Location = New System.Drawing.Point(51, 255) Me.Label20.Name = "Label20" Me.Label20.Size = New System.Drawing.Size(28, 19) Me.Label20.TabIndex = 9 @@ -2326,7 +2347,7 @@ Partial Class frmHauptfenster Me.picAVISOMessenger.BackgroundImage = Global.AVISO.My.Resources.Resources.aviso_messenger Me.picAVISOMessenger.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom Me.picAVISOMessenger.Cursor = System.Windows.Forms.Cursors.Hand - Me.picAVISOMessenger.Location = New System.Drawing.Point(1, 119) + Me.picAVISOMessenger.Location = New System.Drawing.Point(3, 207) Me.picAVISOMessenger.Name = "picAVISOMessenger" Me.picAVISOMessenger.Size = New System.Drawing.Size(59, 55) Me.picAVISOMessenger.TabIndex = 7 @@ -2337,7 +2358,7 @@ Partial Class frmHauptfenster ' Me.pic.BackgroundImage = Global.AVISO.My.Resources.Resources.disconnect Me.pic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom - Me.pic.Location = New System.Drawing.Point(69, 124) + Me.pic.Location = New System.Drawing.Point(71, 126) Me.pic.Name = "pic" Me.pic.Size = New System.Drawing.Size(59, 50) Me.pic.TabIndex = 5 @@ -2353,7 +2374,7 @@ Partial Class frmHauptfenster Me.Panel2.Controls.Add(Me.btnZollwebseiten) Me.Panel2.Controls.Add(Me.lblHinweis) Me.Panel2.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel2.Location = New System.Drawing.Point(0, 0) + Me.Panel2.Location = New System.Drawing.Point(0, 91) Me.Panel2.Name = "Panel2" Me.Panel2.Size = New System.Drawing.Size(164, 111) Me.Panel2.TabIndex = 10 @@ -2411,13 +2432,14 @@ Partial Class frmHauptfenster ' 'pnlLinksOben ' + Me.pnlLinksOben.Controls.Add(Me.Button7) Me.pnlLinksOben.Controls.Add(Me.Label22) Me.pnlLinksOben.Controls.Add(Me.Button12) Me.pnlLinksOben.Controls.Add(Me.btnNeu) Me.pnlLinksOben.Dock = System.Windows.Forms.DockStyle.Top Me.pnlLinksOben.Location = New System.Drawing.Point(0, 0) Me.pnlLinksOben.Name = "pnlLinksOben" - Me.pnlLinksOben.Size = New System.Drawing.Size(164, 86) + Me.pnlLinksOben.Size = New System.Drawing.Size(164, 91) Me.pnlLinksOben.TabIndex = 1 ' 'Label22 @@ -2425,7 +2447,7 @@ Partial Class frmHauptfenster Me.Label22.BackColor = System.Drawing.Color.Red Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label22.ForeColor = System.Drawing.Color.White - Me.Label22.Location = New System.Drawing.Point(92, 53) + Me.Label22.Location = New System.Drawing.Point(92, 89) Me.Label22.Name = "Label22" Me.Label22.Size = New System.Drawing.Size(28, 19) Me.Label22.TabIndex = 10 @@ -2439,7 +2461,7 @@ Partial Class frmHauptfenster Me.Button12.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button12.ForeColor = System.Drawing.Color.Black Me.Button12.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button12.Location = New System.Drawing.Point(5, 44) + Me.Button12.Location = New System.Drawing.Point(5, 80) Me.Button12.MaximumSize = New System.Drawing.Size(121, 34) Me.Button12.Name = "Button12" Me.Button12.Size = New System.Drawing.Size(121, 34) @@ -2462,7 +2484,7 @@ Partial Class frmHauptfenster Me.btnNeu.Name = "btnNeu" Me.btnNeu.Size = New System.Drawing.Size(121, 34) Me.btnNeu.TabIndex = 0 - Me.btnNeu.Text = " NEU" + Me.btnNeu.Text = " LKW" Me.btnNeu.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnNeu.UseVisualStyleBackColor = True ' @@ -2492,8 +2514,8 @@ Partial Class frmHauptfenster 'SplitContainer3.Panel2 ' Me.SplitContainer3.Panel2.Controls.Add(Me.pnl) - Me.SplitContainer3.Size = New System.Drawing.Size(650, 300) - Me.SplitContainer3.SplitterDistance = 158 + Me.SplitContainer3.Size = New System.Drawing.Size(555, 300) + Me.SplitContainer3.SplitterDistance = 134 Me.SplitContainer3.TabIndex = 3 ' 'pnl @@ -2504,7 +2526,7 @@ Partial Class frmHauptfenster Me.pnl.Dock = System.Windows.Forms.DockStyle.Fill Me.pnl.Location = New System.Drawing.Point(0, 0) Me.pnl.Name = "pnl" - Me.pnl.Size = New System.Drawing.Size(488, 300) + Me.pnl.Size = New System.Drawing.Size(417, 300) Me.pnl.TabIndex = 0 ' 'Button10 @@ -2528,41 +2550,41 @@ Partial Class frmHauptfenster Me.gridMyAviso.AllowUserToDeleteRows = False Me.gridMyAviso.AllowUserToOrderColumns = True Me.gridMyAviso.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure - Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 + DataGridViewCellStyle10.BackColor = System.Drawing.Color.Azure + Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10 Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White - DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - DataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle2 + DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle11.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11 Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle3.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle3 + DataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle12.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle12 Me.gridMyAviso.Dock = System.Windows.Forms.DockStyle.Fill Me.gridMyAviso.Location = New System.Drawing.Point(0, 21) Me.gridMyAviso.Name = "gridMyAviso" Me.gridMyAviso.ReadOnly = True - DataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle4.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle4 + DataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle13.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle13 Me.gridMyAviso.RowHeadersVisible = False Me.gridMyAviso.RowHeadersWidth = 62 - Me.gridMyAviso.Size = New System.Drawing.Size(488, 279) + Me.gridMyAviso.Size = New System.Drawing.Size(417, 279) Me.gridMyAviso.TabIndex = 0 ' 'Panel6 @@ -2582,7 +2604,7 @@ Partial Class frmHauptfenster Me.Panel6.Dock = System.Windows.Forms.DockStyle.Top Me.Panel6.Location = New System.Drawing.Point(0, 0) Me.Panel6.Name = "Panel6" - Me.Panel6.Size = New System.Drawing.Size(488, 21) + Me.Panel6.Size = New System.Drawing.Size(417, 21) Me.Panel6.TabIndex = 1 ' 'cbx_My_Brexit @@ -2590,7 +2612,7 @@ Partial Class frmHauptfenster Me.cbx_My_Brexit.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.cbx_My_Brexit.AutoSize = True Me.cbx_My_Brexit.ForeColor = System.Drawing.Color.White - Me.cbx_My_Brexit.Location = New System.Drawing.Point(-91, 3) + Me.cbx_My_Brexit.Location = New System.Drawing.Point(-162, 3) Me.cbx_My_Brexit.Name = "cbx_My_Brexit" Me.cbx_My_Brexit.Size = New System.Drawing.Size(65, 17) Me.cbx_My_Brexit.TabIndex = 28 @@ -2602,7 +2624,7 @@ Partial Class frmHauptfenster ' Me.btnColor.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnColor.BackColor = System.Drawing.Color.White - Me.btnColor.Location = New System.Drawing.Point(397, -1) + Me.btnColor.Location = New System.Drawing.Point(326, -1) Me.btnColor.Name = "btnColor" Me.btnColor.Size = New System.Drawing.Size(36, 23) Me.btnColor.TabIndex = 27 @@ -2632,7 +2654,7 @@ Partial Class frmHauptfenster Me.cboMy_Grenzstelle.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.cboMy_Grenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.cboMy_Grenzstelle.FormattingEnabled = True - Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(113, 1) + Me.cboMy_Grenzstelle.Location = New System.Drawing.Point(42, 1) Me.cboMy_Grenzstelle.Name = "cboMy_Grenzstelle" Me.cboMy_Grenzstelle.Size = New System.Drawing.Size(64, 21) Me.cboMy_Grenzstelle.TabIndex = 26 @@ -2642,7 +2664,7 @@ Partial Class frmHauptfenster Me.lblMySnd_Grenzstelle.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblMySnd_Grenzstelle.AutoSize = True Me.lblMySnd_Grenzstelle.ForeColor = System.Drawing.Color.White - Me.lblMySnd_Grenzstelle.Location = New System.Drawing.Point(45, 4) + Me.lblMySnd_Grenzstelle.Location = New System.Drawing.Point(-26, 4) Me.lblMySnd_Grenzstelle.Name = "lblMySnd_Grenzstelle" Me.lblMySnd_Grenzstelle.Size = New System.Drawing.Size(62, 13) Me.lblMySnd_Grenzstelle.TabIndex = 25 @@ -2653,7 +2675,7 @@ Partial Class frmHauptfenster Me.cbx_My_LKW.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.cbx_My_LKW.AutoSize = True Me.cbx_My_LKW.ForeColor = System.Drawing.Color.White - Me.cbx_My_LKW.Location = New System.Drawing.Point(-11, 3) + Me.cbx_My_LKW.Location = New System.Drawing.Point(-82, 3) Me.cbx_My_LKW.Name = "cbx_My_LKW" Me.cbx_My_LKW.Size = New System.Drawing.Size(50, 17) Me.cbx_My_LKW.TabIndex = 24 @@ -2667,7 +2689,7 @@ Partial Class frmHauptfenster Me.cboMy_QS.Checked = True Me.cboMy_QS.CheckState = System.Windows.Forms.CheckState.Indeterminate Me.cboMy_QS.ForeColor = System.Drawing.Color.White - Me.cboMy_QS.Location = New System.Drawing.Point(445, 3) + Me.cboMy_QS.Location = New System.Drawing.Point(374, 3) Me.cboMy_QS.Name = "cboMy_QS" Me.cboMy_QS.Size = New System.Drawing.Size(15, 14) Me.cboMy_QS.TabIndex = 23 @@ -2681,7 +2703,7 @@ Partial Class frmHauptfenster Me.cboMy_VB.Checked = True Me.cboMy_VB.CheckState = System.Windows.Forms.CheckState.Indeterminate Me.cboMy_VB.ForeColor = System.Drawing.Color.White - Me.cboMy_VB.Location = New System.Drawing.Point(464, 3) + Me.cboMy_VB.Location = New System.Drawing.Point(393, 3) Me.cboMy_VB.Name = "cboMy_VB" Me.cboMy_VB.Size = New System.Drawing.Size(15, 14) Me.cboMy_VB.TabIndex = 22 @@ -2699,7 +2721,7 @@ Partial Class frmHauptfenster Me.cboMyAvisoAnzeige.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.cboMyAvisoAnzeige.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) Me.cboMyAvisoAnzeige.FormattingEnabled = True - Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(232, 1) + Me.cboMyAvisoAnzeige.Location = New System.Drawing.Point(161, 1) Me.cboMyAvisoAnzeige.Name = "cboMyAvisoAnzeige" Me.cboMyAvisoAnzeige.Size = New System.Drawing.Size(127, 21) Me.cboMyAvisoAnzeige.TabIndex = 21 @@ -2709,7 +2731,7 @@ Partial Class frmHauptfenster Me.lblMySND_Anzeige.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblMySND_Anzeige.AutoSize = True Me.lblMySND_Anzeige.ForeColor = System.Drawing.Color.White - Me.lblMySND_Anzeige.Location = New System.Drawing.Point(183, 3) + Me.lblMySND_Anzeige.Location = New System.Drawing.Point(112, 3) Me.lblMySND_Anzeige.Name = "lblMySND_Anzeige" Me.lblMySND_Anzeige.Size = New System.Drawing.Size(48, 13) Me.lblMySND_Anzeige.TabIndex = 20 @@ -2719,7 +2741,7 @@ Partial Class frmHauptfenster ' Me.lblAkte.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAkte.ForeColor = System.Drawing.Color.White - Me.lblAkte.Location = New System.Drawing.Point(761, 6) + Me.lblAkte.Location = New System.Drawing.Point(690, 6) Me.lblAkte.Name = "lblAkte" Me.lblAkte.Size = New System.Drawing.Size(207, 19) Me.lblAkte.TabIndex = 1 @@ -2807,7 +2829,7 @@ Partial Class frmHauptfenster Me.pnlAktOption.Dock = System.Windows.Forms.DockStyle.Top Me.pnlAktOption.Location = New System.Drawing.Point(0, 0) Me.pnlAktOption.Name = "pnlAktOption" - Me.pnlAktOption.Size = New System.Drawing.Size(815, 5) + Me.pnlAktOption.Size = New System.Drawing.Size(720, 5) Me.pnlAktOption.TabIndex = 1 ' 'Button8 @@ -2817,7 +2839,7 @@ Partial Class frmHauptfenster Me.Button8.ForeColor = System.Drawing.Color.Black Me.Button8.Image = CType(resources.GetObject("Button8.Image"), System.Drawing.Image) Me.Button8.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.Button8.Location = New System.Drawing.Point(381, 214) + Me.Button8.Location = New System.Drawing.Point(286, 214) Me.Button8.Name = "Button8" Me.Button8.Size = New System.Drawing.Size(89, 34) Me.Button8.TabIndex = 3 @@ -2834,7 +2856,7 @@ Partial Class frmHauptfenster Me.btnFertig.ForeColor = System.Drawing.Color.Black Me.btnFertig.Image = CType(resources.GetObject("btnFertig.Image"), System.Drawing.Image) Me.btnFertig.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnFertig.Location = New System.Drawing.Point(485, 214) + Me.btnFertig.Location = New System.Drawing.Point(390, 214) Me.btnFertig.Name = "btnFertig" Me.btnFertig.Size = New System.Drawing.Size(102, 34) Me.btnFertig.TabIndex = 0 @@ -2853,7 +2875,7 @@ Partial Class frmHauptfenster Me.tabAlle.Padding = New System.Windows.Forms.Padding(3) Me.tabAlle.Size = New System.Drawing.Size(385, 0) Me.tabAlle.TabIndex = 0 - Me.tabAlle.Text = "Alle" + Me.tabAlle.Text = "Alle LKW" ' 'tabErfasst ' @@ -2911,7 +2933,7 @@ Partial Class frmHauptfenster Me.SplitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill Me.SplitContainer1.IsSplitterFixed = True - Me.SplitContainer1.Location = New System.Drawing.Point(0, 77) + Me.SplitContainer1.Location = New System.Drawing.Point(379, 77) Me.SplitContainer1.Name = "SplitContainer1" ' 'SplitContainer1.Panel1 @@ -2924,8 +2946,8 @@ Partial Class frmHauptfenster Me.SplitContainer1.Panel2.Controls.Add(Me.btnSmall) Me.SplitContainer1.Panel2.Controls.Add(Me.pnlDetailsRechts) Me.SplitContainer1.Panel2MinSize = 300 - Me.SplitContainer1.Size = New System.Drawing.Size(1372, 600) - Me.SplitContainer1.SplitterDistance = 819 + Me.SplitContainer1.Size = New System.Drawing.Size(993, 600) + Me.SplitContainer1.SplitterDistance = 724 Me.SplitContainer1.SplitterWidth = 1 Me.SplitContainer1.TabIndex = 7 ' @@ -2938,7 +2960,7 @@ Partial Class frmHauptfenster Me.pnlDetailsLinks.Location = New System.Drawing.Point(0, 0) Me.pnlDetailsLinks.MinimumSize = New System.Drawing.Size(324, 564) Me.pnlDetailsLinks.Name = "pnlDetailsLinks" - Me.pnlDetailsLinks.Size = New System.Drawing.Size(817, 598) + Me.pnlDetailsLinks.Size = New System.Drawing.Size(722, 598) Me.pnlDetailsLinks.TabIndex = 0 ' 'splitMain @@ -2962,7 +2984,7 @@ Partial Class frmHauptfenster ' Me.splitMain.Panel2.Controls.Add(Me.SplitContainer2) Me.splitMain.Panel2.Controls.Add(Me.pnlAktOption) - Me.splitMain.Size = New System.Drawing.Size(815, 596) + Me.splitMain.Size = New System.Drawing.Size(720, 596) Me.splitMain.SplitterDistance = 287 Me.splitMain.TabIndex = 0 ' @@ -2972,57 +2994,58 @@ Partial Class frmHauptfenster Me.gridAviso.AllowUserToAddRows = False Me.gridAviso.AllowUserToDeleteRows = False Me.gridAviso.AllowUserToResizeRows = False - DataGridViewCellStyle5.BackColor = System.Drawing.Color.Azure - DataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 + DataGridViewCellStyle14.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle14 Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable - DataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle6.BackColor = System.Drawing.Color.LightBlue - DataGridViewCellStyle6.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] - Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle6 + DataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle15.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle15.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle15 Me.gridAviso.ColumnHeadersHeight = 25 Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing - DataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window - DataGridViewCellStyle7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText - DataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle7 + DataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle16 Me.gridAviso.Dock = System.Windows.Forms.DockStyle.Fill Me.gridAviso.Location = New System.Drawing.Point(0, 248) Me.gridAviso.MultiSelect = False Me.gridAviso.Name = "gridAviso" Me.gridAviso.ReadOnly = True - DataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft - DataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control - DataGridViewCellStyle8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - DataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText - DataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight - DataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText - DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle8 + DataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle17.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle17 Me.gridAviso.RowHeadersVisible = False Me.gridAviso.RowHeadersWidth = 62 Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing - DataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] - Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle9 + DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle18 Me.gridAviso.RowTemplate.ReadOnly = True Me.gridAviso.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.[False] Me.gridAviso.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect - Me.gridAviso.Size = New System.Drawing.Size(815, 39) + Me.gridAviso.Size = New System.Drawing.Size(720, 39) Me.gridAviso.TabIndex = 1 Me.gridAviso.TabStop = False ' 'Panel1 ' Me.Panel1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Panel1.Controls.Add(Me.TabControl1) Me.Panel1.Controls.Add(Me.txtBestimmungszollstelle) Me.Panel1.Controls.Add(Me.Label10) Me.Panel1.Controls.Add(Me.cboImEx) @@ -3050,7 +3073,7 @@ Partial Class frmHauptfenster Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(815, 248) + Me.Panel1.Size = New System.Drawing.Size(720, 248) Me.Panel1.TabIndex = 2 ' 'txtBestimmungszollstelle @@ -3182,7 +3205,7 @@ Partial Class frmHauptfenster Me.lblEintraege.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblEintraege.BackColor = System.Drawing.Color.Transparent Me.lblEintraege.ForeColor = System.Drawing.Color.White - Me.lblEintraege.Location = New System.Drawing.Point(585, 56) + Me.lblEintraege.Location = New System.Drawing.Point(490, 56) Me.lblEintraege.Name = "lblEintraege" Me.lblEintraege.Size = New System.Drawing.Size(169, 15) Me.lblEintraege.TabIndex = 14 @@ -3230,7 +3253,7 @@ Partial Class frmHauptfenster Me.pnlTime.Controls.Add(Me.Label5) Me.pnlTime.Location = New System.Drawing.Point(446, 0) Me.pnlTime.Name = "pnlTime" - Me.pnlTime.Size = New System.Drawing.Size(437, 57) + Me.pnlTime.Size = New System.Drawing.Size(342, 57) Me.pnlTime.TabIndex = 12 ' 'MyComboBox1 @@ -3738,8 +3761,8 @@ Partial Class frmHauptfenster ' 'Panel3 ' - Me.Panel3.Controls.Add(Me.Panel4) Me.Panel3.Controls.Add(Me.MenuStrip1) + Me.Panel3.Controls.Add(Me.Panel4) Me.Panel3.Dock = System.Windows.Forms.DockStyle.Top Me.Panel3.Location = New System.Drawing.Point(0, 0) Me.Panel3.Name = "Panel3" @@ -3786,15 +3809,17 @@ Partial Class frmHauptfenster Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) Me.UsrCntlTestsystem1.TabIndex = 8 ' - 'Button1 + 'pnlLeft ' - Me.Button1.Location = New System.Drawing.Point(1028, 7) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(75, 23) - Me.Button1.TabIndex = 87 - Me.Button1.Text = "Button1" - Me.Button1.UseVisualStyleBackColor = True - Me.Button1.Visible = False + Me.pnlLeft.Controls.Add(Me.UsrCntlBenachrichtigungen2) + Me.pnlLeft.Controls.Add(Me.Panel5) + Me.pnlLeft.Controls.Add(Me.Panel7) + Me.pnlLeft.Dock = System.Windows.Forms.DockStyle.Left + Me.pnlLeft.Location = New System.Drawing.Point(0, 77) + Me.pnlLeft.Name = "pnlLeft" + Me.pnlLeft.Size = New System.Drawing.Size(379, 600) + Me.pnlLeft.TabIndex = 88 + Me.pnlLeft.Visible = False ' 'UsrCntlBenachrichtigungen1 ' @@ -3802,9 +3827,100 @@ Partial Class frmHauptfenster Me.UsrCntlBenachrichtigungen1.Location = New System.Drawing.Point(0, 0) Me.UsrCntlBenachrichtigungen1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.UsrCntlBenachrichtigungen1.Name = "UsrCntlBenachrichtigungen1" - Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(158, 300) + Me.UsrCntlBenachrichtigungen1.Size = New System.Drawing.Size(134, 300) Me.UsrCntlBenachrichtigungen1.TabIndex = 0 ' + 'UsrCntlBenachrichtigungen2 + ' + Me.UsrCntlBenachrichtigungen2.Dock = System.Windows.Forms.DockStyle.Fill + Me.UsrCntlBenachrichtigungen2.Location = New System.Drawing.Point(0, 51) + Me.UsrCntlBenachrichtigungen2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.UsrCntlBenachrichtigungen2.Name = "UsrCntlBenachrichtigungen2" + Me.UsrCntlBenachrichtigungen2.Size = New System.Drawing.Size(379, 232) + Me.UsrCntlBenachrichtigungen2.TabIndex = 1 + ' + 'Panel5 + ' + Me.Panel5.Dock = System.Windows.Forms.DockStyle.Bottom + Me.Panel5.Location = New System.Drawing.Point(0, 283) + Me.Panel5.Name = "Panel5" + Me.Panel5.Size = New System.Drawing.Size(379, 317) + Me.Panel5.TabIndex = 3 + ' + 'Panel7 + ' + Me.Panel7.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Panel7.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel7.Location = New System.Drawing.Point(0, 0) + Me.Panel7.Name = "Panel7" + Me.Panel7.Size = New System.Drawing.Size(379, 51) + Me.Panel7.TabIndex = 4 + ' + 'Button7 + ' + Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button7.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) + Me.Button7.ForeColor = System.Drawing.Color.Black + Me.Button7.Image = CType(resources.GetObject("Button7.Image"), System.Drawing.Image) + Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.Button7.Location = New System.Drawing.Point(5, 39) + Me.Button7.MaximumSize = New System.Drawing.Size(121, 35) + Me.Button7.Name = "Button7" + Me.Button7.Size = New System.Drawing.Size(121, 35) + Me.Button7.TabIndex = 11 + Me.Button7.Text = "Sendung" + Me.Button7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button7.UseVisualStyleBackColor = True + Me.Button7.Visible = False + ' + 'TabControl1 + ' + Me.TabControl1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) + Me.TabControl1.Controls.Add(Me.tbSndAlle) + Me.TabControl1.Controls.Add(Me.tbSndOffen) + Me.TabControl1.Controls.Add(Me.tbSndFreigegeben) + Me.TabControl1.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TabControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.TabControl1.ItemSize = New System.Drawing.Size(60, 30) + Me.TabControl1.Location = New System.Drawing.Point(627, 217) + Me.TabControl1.Name = "TabControl1" + Me.TabControl1.Padding = New System.Drawing.Point(12, 3) + Me.TabControl1.SelectedIndex = 0 + Me.TabControl1.Size = New System.Drawing.Size(393, 32) + Me.TabControl1.TabIndex = 27 + ' + 'tbSndAlle + ' + Me.tbSndAlle.BackColor = System.Drawing.SystemColors.ActiveBorder + Me.tbSndAlle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.tbSndAlle.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.tbSndAlle.Location = New System.Drawing.Point(4, 34) + Me.tbSndAlle.Name = "tbSndAlle" + Me.tbSndAlle.Padding = New System.Windows.Forms.Padding(3) + Me.tbSndAlle.Size = New System.Drawing.Size(385, 0) + Me.tbSndAlle.TabIndex = 0 + Me.tbSndAlle.Text = "Alle Sendungen" + ' + 'tbSndOffen + ' + Me.tbSndOffen.BackColor = System.Drawing.SystemColors.ActiveBorder + Me.tbSndOffen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.tbSndOffen.Location = New System.Drawing.Point(4, 34) + Me.tbSndOffen.Name = "tbSndOffen" + Me.tbSndOffen.Padding = New System.Windows.Forms.Padding(3) + Me.tbSndOffen.Size = New System.Drawing.Size(385, 0) + Me.tbSndOffen.TabIndex = 1 + Me.tbSndOffen.Text = "Offen" + ' + 'tbSndFreigegeben + ' + Me.tbSndFreigegeben.Location = New System.Drawing.Point(4, 34) + Me.tbSndFreigegeben.Name = "tbSndFreigegeben" + Me.tbSndFreigegeben.Size = New System.Drawing.Size(385, 0) + Me.tbSndFreigegeben.TabIndex = 2 + Me.tbSndFreigegeben.Text = "Freigegeben" + Me.tbSndFreigegeben.UseVisualStyleBackColor = True + ' 'frmHauptfenster ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -3814,6 +3930,7 @@ Partial Class frmHauptfenster Me.Controls.Add(Me.Label9) Me.Controls.Add(Me.UsrCntlTestsystem1) Me.Controls.Add(Me.SplitContainer1) + Me.Controls.Add(Me.pnlLeft) Me.Controls.Add(Me.Top) Me.Controls.Add(Me.Panel3) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None @@ -3874,6 +3991,8 @@ Partial Class frmHauptfenster Me.Panel3.PerformLayout() Me.Panel4.ResumeLayout(False) Me.cntVerag.ResumeLayout(False) + Me.pnlLeft.ResumeLayout(False) + Me.TabControl1.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -4245,4 +4364,13 @@ Partial Class frmHauptfenster Friend WithEvents SpireLizenzPrüfenToolStripMenuItem As ToolStripMenuItem Friend WithEvents DEAmbarToolStripMenuItem As ToolStripMenuItem Friend WithEvents Button1 As Button + Friend WithEvents pnlLeft As Panel + Friend WithEvents UsrCntlBenachrichtigungen2 As usrCntlBenachrichtigungen + Friend WithEvents Panel5 As Panel + Friend WithEvents Panel7 As Panel + Friend WithEvents Button7 As Button + Friend WithEvents TabControl1 As TabControl + Friend WithEvents tbSndAlle As TabPage + Friend WithEvents tbSndOffen As TabPage + Friend WithEvents tbSndFreigegeben As TabPage End Class diff --git a/Aviso/frmHauptfenster.resx b/Aviso/frmHauptfenster.resx index b95b36c..f08b01e 100644 --- a/Aviso/frmHauptfenster.resx +++ b/Aviso/frmHauptfenster.resx @@ -184,6 +184,14 @@ 3puAtTwzrR0dXuW8gXnGLeaSa2rIfBHWsJY1Kw5/z224h+LDxOuRG/Lqw+FV0xrZ36za8GJ7Dn3winGk hlhFP8ytdHEuO7yRe93zq1OtoTFeL82pa3iF96vjKNfQYYyxFUaS7APsTyl69HfqsQAAAABJRU5ErkJg gg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAABdSURBVEhL7c0xDsAgEANB/v+AfNcUyRWWVhEF0JyL + oUDW7ZB0FX6e9D7PMv2gvUmQUKjQ3iRIKFRob3oF6cB2CW7XK7gKD31obxIkFCq0NwkSChXam0bBm/Dz + HI0JXRTSkcElwuUAAAAASUVORK5CYII= @@ -243,6 +251,9 @@ pOTzPwAAAABJRU5ErkJggg== + + 560, 17 + 659, 17 diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index db32eef..b53a14a 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -10,6 +10,8 @@ Imports System.Drawing.Drawing2D Imports SDL Imports Microsoft.Office.Interop Imports Spire.Pdf.Texts +Imports System.Net +Imports System.Text 'Imports UID @@ -4803,9 +4805,40 @@ Public Class frmHauptfenster End Sub Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click - - saveLukowaPDFsFromTherefore() + Dim resp = GetDataFromSharePoint("https://dpdhl.sharepoint.com/sites/FRTTR-Verag", "TruckList", "al@verag.ag", "Muellerskuh1!") + MsgBox(resp) + 'saveLukowaPDFsFromTherefore() End Sub + + + + Public Function GetDataFromSharePoint(siteUrl As String, listName As String, username As String, password As String) As String + ' SharePoint-URL und Liste konfigurieren + Dim requestUrl As String = siteUrl & "/_api/web/lists/getbytitle('" & listName & "')/items" + + ' Authentifizierung: Benutzername und Passwort als Basis64 + Dim credentials As String = Convert.ToBase64String(Encoding.ASCII.GetBytes(username & ":" & password)) + + ' HTTP-Anfrage vorbereiten + Dim request As HttpWebRequest = CType(WebRequest.Create(requestUrl), HttpWebRequest) + request.Method = "GET" + request.Accept = "application/json;odata=verbose" + request.Headers("Authorization") = "Basic " & credentials + + Try + ' Antwort von SharePoint erhalten + Using response As HttpWebResponse = CType(request.GetResponse(), HttpWebResponse) + Using reader As New StreamReader(response.GetResponseStream()) + Dim jsonResponse As String = reader.ReadToEnd() + Return jsonResponse + End Using + End Using + Catch ex As WebException + ' Fehlerbehandlung + Return "Fehler: " & ex.Message + End Try + End Function + End Class Public Class AvisoStatusFunctions diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index 2b41b12..c329068 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -22,9 +22,9 @@ Public Class frmSendungsdetailsNEU Dim PROG As New cProgramFunctions Dim AVISO As New cAviso ' Dim GEAENDERT As Boolean = False - Dim SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen) + Public SENDUNG_LIST As New List(Of VERAG_PROG_ALLGEMEIN.cSendungen) - Dim CURRENT_INDEX As Integer = -1 + Public CURRENT_INDEX As Integer = -1 Dim closeWithoutSave = False ' Public WithEvents bsSendungen As New cEasyBinding("AVISO") 'fürs Binding Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL @@ -1456,7 +1456,8 @@ Public Class frmSendungsdetailsNEU usrcntl_AUSFUHR.reset() usrcntl_FISKAL.reset() usrcntl_ATA = New usrCntlSND_Handling(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) - usrcntl_ATB = New usrCntlSND_ATBGestellung(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) + 'usrcntl_ATB = New usrCntlSND_ATBGestellung(SENDUNG_LIST(CURRENT_INDEX).tblSnd_SendungID) + usrcntl_ATB = New usrCntlSND_ATBGestellung(AVISO, SENDUNG_LIST(CURRENT_INDEX)) AddHandler usrcntl_ATA.HandlingWerte, Sub(colli, gewicht, anzahlSendungen) txtColli.Text = colli @@ -2347,23 +2348,33 @@ Public Class frmSendungsdetailsNEU Private Sub cboAbfertigungsart_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboAbfertigungsart.SelectedIndexChanged btnLeihgeld.Enabled = False - lblAnzahl.Visible = (cboAbfertigungsart._value = "23") - txtAnzahl.Visible = (cboAbfertigungsart._value = "23") + lblAnzahl.Visible = False + txtAnzahl.Visible = False + + btnAufschub_Atr.Visible = True + btnAufschub_Empf.Visible = True + btnAufschub_VERAG.Visible = True + + Select Case cboAbfertigungsart._value + Case "23", "67", "68" + lblAnzahl.Visible = True + txtAnzahl.Visible = True + + btnAufschub_Atr.Visible = False + btnAufschub_Empf.Visible = False + btnAufschub_VERAG.Visible = False + SENDUNG_LIST(CURRENT_INDEX).tblSnd_aufschub = "" + txtDyRef.Visible = False + picDy.Visible = False + txtDyRef.Text = "" + End Select 'grpAufschub.Visible = (cboAbfertigungsart._value <> "23") - btnAufschub_Atr.Visible = (cboAbfertigungsart._value <> "23") - btnAufschub_Empf.Visible = (cboAbfertigungsart._value <> "23") - btnAufschub_VERAG.Visible = (cboAbfertigungsart._value <> "23") + setContextMenuGVMSControl() - If cboAbfertigungsart._value = "23" Then - SENDUNG_LIST(CURRENT_INDEX).tblSnd_aufschub = "" - - txtDyRef.Visible = False - picDy.Visible = False - txtDyRef.Text = "" - ElseIf cboAbfertigungsart._value = "9" Then + If cboAbfertigungsart._value = "9" Then btnLeihgeld.Enabled = True Else txtDyRef.Visible = (SENDUNG_LIST(CURRENT_INDEX).FilialenNr = "5601") 'UNISPED diff --git a/Aviso/usrCntlSND_ATBGestellung.Designer.vb b/Aviso/usrCntlSND_ATBGestellung.Designer.vb index e841462..7a251b9 100644 --- a/Aviso/usrCntlSND_ATBGestellung.Designer.vb +++ b/Aviso/usrCntlSND_ATBGestellung.Designer.vb @@ -23,18 +23,20 @@ Partial Class usrCntlSND_ATBGestellung Private Sub InitializeComponent() Me.pnlT1 = New System.Windows.Forms.Panel() + Me.Button1 = New System.Windows.Forms.Button() + Me.cbxATBFakturieren = New System.Windows.Forms.CheckBox() Me.txtATBNr = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.txtATBT1 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.Label4 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() Me.txtT1VerzollungsadresseBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.Label33 = New System.Windows.Forms.Label() - Me.cbxATBFakturieren = New System.Windows.Forms.CheckBox() Me.pnlT1.SuspendLayout() Me.SuspendLayout() ' 'pnlT1 ' + Me.pnlT1.Controls.Add(Me.Button1) Me.pnlT1.Controls.Add(Me.cbxATBFakturieren) Me.pnlT1.Controls.Add(Me.txtATBNr) Me.pnlT1.Controls.Add(Me.txtATBT1) @@ -47,6 +49,30 @@ Partial Class usrCntlSND_ATBGestellung Me.pnlT1.Size = New System.Drawing.Size(549, 101) Me.pnlT1.TabIndex = 0 ' + 'Button1 + ' + Me.Button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Location = New System.Drawing.Point(397, 56) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(149, 35) + Me.Button1.TabIndex = 25 + Me.Button1.Text = "Ankunftsanzeige senden >>" + Me.Button1.UseVisualStyleBackColor = True + ' + 'cbxATBFakturieren + ' + Me.cbxATBFakturieren.AutoSize = True + Me.cbxATBFakturieren.Checked = True + Me.cbxATBFakturieren.CheckState = System.Windows.Forms.CheckState.Indeterminate + Me.cbxATBFakturieren.Location = New System.Drawing.Point(121, 80) + Me.cbxATBFakturieren.Name = "cbxATBFakturieren" + Me.cbxATBFakturieren.Size = New System.Drawing.Size(153, 17) + Me.cbxATBFakturieren.TabIndex = 24 + Me.cbxATBFakturieren.Text = "ATB-Gestellung fakturieren" + Me.cbxATBFakturieren.ThreeState = True + Me.cbxATBFakturieren.UseVisualStyleBackColor = True + ' 'txtATBNr ' Me.txtATBNr._DateTimeOnly = False @@ -148,26 +174,11 @@ Partial Class usrCntlSND_ATBGestellung Me.Label33.TabIndex = 3 Me.Label33.Text = "Vorpapier / T1:" ' - 'cbxATBFakturieren - ' - Me.cbxATBFakturieren.AutoSize = True - Me.cbxATBFakturieren.Checked = True - Me.cbxATBFakturieren.CheckState = System.Windows.Forms.CheckState.Indeterminate - Me.cbxATBFakturieren.Location = New System.Drawing.Point(121, 80) - Me.cbxATBFakturieren.Name = "cbxATBFakturieren" - Me.cbxATBFakturieren.Size = New System.Drawing.Size(153, 17) - Me.cbxATBFakturieren.TabIndex = 24 - Me.cbxATBFakturieren.Text = "ATB-Gestellung fakturieren" - Me.cbxATBFakturieren.ThreeState = True - Me.cbxATBFakturieren.UseVisualStyleBackColor = True - ' 'usrCntlSND_ATBGestellung ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.pnlT1) Me.Name = "usrCntlSND_ATBGestellung" - Me.Size = New System.Drawing.Size(549, 94) + Me.Size = New System.Drawing.Size(553, 106) Me.pnlT1.ResumeLayout(False) Me.pnlT1.PerformLayout() Me.ResumeLayout(False) @@ -181,4 +192,5 @@ Partial Class usrCntlSND_ATBGestellung Friend WithEvents Label4 As Label Friend WithEvents txtATBNr As VERAG_PROG_ALLGEMEIN.MyTextBox Friend WithEvents cbxATBFakturieren As CheckBox + Friend WithEvents Button1 As Button End Class diff --git a/Aviso/usrCntlSND_ATBGestellung.vb b/Aviso/usrCntlSND_ATBGestellung.vb index e1d5df7..f295480 100644 --- a/Aviso/usrCntlSND_ATBGestellung.vb +++ b/Aviso/usrCntlSND_ATBGestellung.vb @@ -1,17 +1,47 @@ -Public Class usrCntlSND_ATBGestellung +Imports DAKOSY_Worker +Imports SDL + +Public Class usrCntlSND_ATBGestellung 'Public NCTS_GA As VERAG_PROG_ALLGEMEIN.cNCTSGestellungsadressen + Dim AVISO As VERAG_PROG_ALLGEMEIN.cAviso = Nothing + Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = Nothing - Sub New(SendungsId) + Sub New(AVISO, SND) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() + Me.AVISO = AVISO + Me.SND = SND + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. End Sub + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + + Me.Refresh() + Me.Cursor = Cursors.WaitCursor + + Dim f As frmSendungsdetailsNEU = Me.FindForm + If f.SAVE_ME() Then + SND = f.SENDUNG_LIST(f.CURRENT_INDEX) + + If Not IsNumeric(SND.AbfertigungsNr) OrElse CInt(SND.AbfertigungsNr) < 100000 Then MsgBox("Abfertigungsnummer angeben!") : Exit Sub + If If(SND.tblSnd_ATB_T1, "") = "" Then MsgBox("MRN (Gestellung) angeben!") : Exit Sub + Dim frMZA As New SDL.frmZollanmeldung("AA", Nothing, AVISO, SND, Now.ToString("yy")) + frMZA.Show() + AddHandler frMZA.FormClosed, Sub() + ' initdgvZollAnmeldungen() + End Sub + Else + MsgBox("Fehler beim Speichern. Ankunftsanzeige abgebrochen.") + End If + Me.Cursor = Cursors.Default + + End Sub 'Public Sub setValues() diff --git a/Diverses/remind-4-32.png b/Diverses/remind-4-32.png new file mode 100644 index 0000000000000000000000000000000000000000..a4828a264d80e187ae4560569c1eb0ce4f6c5a88 GIT binary patch literal 707 zcmV;!0zCbRP)Px#AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBU!K}keGR9J=WR?A8pK@@eK-P5M0hj~v{op~_RGfl|Cjo%O<50QXz zA2-45@-Pq-6cJJLIf3j#w!ww?1xD0J0wM7c!Q>pNf>9jPUEP{2=E8-Vs=D`_s(X9t z3=Ak(BoawfDwS2oalX+pUg4ZdE+s3KO7pJk{_b=-M|6%cH+O9WTCLVLL3Lff1Ha8N z=60_fI2w(nEX#UCKzg&;+@#CjSR2Ql!O($G-()_Ye~xYR0Z$|n zcCA+X)CI7Irh99e=7^?gO*+PR%jNPi%CIB%)$8@OWHNax5I7Q4~zqdJfFxa?coO+xB}^aB0lJ zTx1wc)}upT=ytw zm>U=~7jD99^+JFj2YG^f83gN?{7VMbt22v~SwhR5WHOnFu)(Dv_hVv+elRa0aBcpt z37niE;MFK9m;j1t>iin!o(kddQL#dQH!392s0Z0>c9LqBj`5Q&4f*iO2+*K#7rU=g pHkFe4RW+(zmV-Az=UDaRe*ls-JW!OCXyX6?002ovPDHLkV1nzyIaL4v literal 0 HcmV?d00001 diff --git a/Diverses/reminder.png b/Diverses/reminder.png new file mode 100644 index 0000000000000000000000000000000000000000..618ac722d189ce2fc0ab7932e8848f206b3ed2f9 GIT binary patch literal 2087 zcmaJ?dpJ~iAD=?6SLm|SXi;XzRsPHZ7}-kfgF~a(Q@(gf>>S2wADEl-#nTP5b`wde8Hm^SeBs&*yvlJkLpIdom65 zjP(!*gn^qY-CMJgG%s3rrRMvH_H&eG`Bdq`Rr*MUN);%F5KaOq4???%K@sE)fr99L zEsz5Op|uU>aFtw^2Zb*c?!yzS_2Z>+_74y9M7YrH}P%*yN zECNeLgF<1~7&+t<x!Vh6NN`D>|L*Y)2!Lt;s~93xmAF zmQ1%L6KEuBYnrW#?Gl$RT&u}l-04$0vtNWhRw#pw4%Q{d%u zaavaI16QzoF3!tx0ZlT%;%NVC)Js{ zcM!MkEE+qXzV|5c-d871aCq(q)@Iyiuzf9aLjC>qbNsVwWWuIXTGcv(P%pJ0)3KsL z)G3=r`{o*U1))9B?S9{*&+qTrxXg zJS}WBZ%sa(_k~+K!Y$-@8A=>GnpH3HGv_jcE&8*fbuQlIac$cj4Gh1m^CR^3eOJyX zJAKi7|OVw%CLqx2${eO`Xsr>i&A8 zt2vUeFszr+y>~VC8U3f@TgD|1nuqkuCQBa%c+%2iD;i<}zi$OC<9GcHZGJFp9WI;c ze`*++H+!{XC@SW1P=4Bf^d6;eIka0}PndasODojTu_tyW>6iX|y;BKA>iCQ@f5UFk z=;MTaH>}DUe|;G^HZo|yGs?%^+1hJde|Y_8bBdrdvpt0;sFBb_PU(f{@nA^|)`i<^ z=s<92Gy*0J*u9-S_TMw_Z$F=GvLT(Bpm*#xQS{(yTB3Ef93k>I*ps}eT^Wh4*u zH`XZAfl!RXP&%`J5s3Y?ri7i+w-FHhF;>WZ4q_a*y+jYwC~GD zI$hPCNPJb-=L1ME#kvUlT5tC2+o;FnL0EqB=;|)GbWP%M(RM7h>SEaHY!Az*A4Rn$ z{nvYZUSC`2^4aA6DEZZ<`t25HWrO8YwS$VA&kw(gtPa;M2rV&Nl}c+KD8m6^x_qkH z0gueglevQGiPL`6*n!=D)Xb%48to12)E%B*kvq`qp20Le+~J-N?86yjI-%;or<;H0 z{khJZQI66YJGKc$J+*&r$C((11~>(c#25oRt){9tW|wMHiW=6g+#I|TaddUSWiIy< zVy;I=j-fyDRXnV9v1-_?IIkE#_C>R4CJU8uqJ7Pr4(8maxa#<#k=$qBy~=4aNUH4p z@y(TlBgmUJo>89shu!R~xYMJ}JZ((=IrWTM;k%Gb^eq1K!SAoNs(0C?8reCoD>a?c z9zQskUpoClw0Z2-baMj()et+Mdh_elyq_$yUHr`VN2fB~H?~h2_IhlrKTOr>fL$9> zz9km7N!GIkq_%X)wl~r=Z&yxUV^h{=fx$wu_dZH1Trel9vu(q4ZA+BQ6z5d{h4oCz z-UD7u%E?0cke6`d@B)AGXX?aBe1L+3ei;{v$$vcau;}ijaK!1%Pg99yFaC%SV^QZV zC`jCI^Y1EP9_eZ6@rgB~_huIeEmvk^K;{B{MsEQXg1Fmtt>oXFiN}k-ZZ{WC`X%R( GgMR@st79er literal 0 HcmV?d00001 diff --git a/Gemeinsames/rptSendungen.vb b/Gemeinsames/rptSendungen.vb index 1216ccc..f5b15e1 100644 --- a/Gemeinsames/rptSendungen.vb +++ b/Gemeinsames/rptSendungen.vb @@ -174,14 +174,18 @@ Public Class rptSendungen If barcodeLKW IsNot Nothing Then If VALUES.barcodeLKW IsNot Nothing Then - barcodeLKW.Image = If(VALUES.barcodeLKW, Nothing) End If End If barcodeSendung.Image = If(VALUES.barcodeSendung, Nothing) - picQR.Image = If(VALUES.imgQR, Nothing) + ' picQR.Image = If(VALUES.imgQR, Nothing) + If picQR IsNot Nothing Then + If VALUES.imgQR IsNot Nothing Then + picQR.Image = If(VALUES.imgQR, Nothing) + End If + End If 'OFFERTE! If False Then