diff --git a/Aviso.sln b/Aviso.sln index 9235345..33ee9a5 100644 --- a/Aviso.sln +++ b/Aviso.sln @@ -11,7 +11,7 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Gemeinsames", "Gemeinsames\ EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "AVISOUPDATER", "AVISOUPDATER\AVISOUPDATER.vbproj", "{D8EDB976-2F90-46C1-9642-63BE8C4F5F1F}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAGAddIn", "..\..\OutlookAddIN\VERAGAddIn\VERAGAddIn\VERAGAddIn.vbproj", "{D579F7A6-7D29-4295-B382-DA5F7EFB4528}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAGAddIn", "..\..\VERAGAddIn\VERAGAddIn\VERAGAddIn.vbproj", "{D579F7A6-7D29-4295-B382-DA5F7EFB4528}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DAKOSY_Worker_lib", "..\..\ADMIN\ADMIN\DAKOSY_Worker\DAKOSY_Worker_lib.vbproj", "{50E8E49B-4FD9-4DD4-B159-BDC2B7D0E94F}" EndProject @@ -19,12 +19,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "AVISO_INFO", "AVISO_INFO\AV EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "NCTSPartnerWorker", "..\..\ADMIN\ADMIN\cNCTSPartnerWorker\NCTSPartnerWorker.vbproj", "{2BBD7643-82A1-481F-A014-EB7FCDEED3B5}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "AVISO_CHECKIN", "AVISO_CHECKIN\AVISO_CHECKIN.vbproj", "{CB95CC0E-D73A-4D11-9FF8-197A392D831F}" -EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAG_TELEINFO", "VERAG_TELEINFO\VERAG_TELEINFO.vbproj", "{5193A729-058C-4C93-B7D3-0A228CA719CC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlathosysApiWrapper", "..\..\..\SCHNITTSTELLEN\PLATHOSYS\WRAPPER\PlathosysApiWrapper-master\PlathosysApiWrapper-master\PlathosysApiWrapper\PlathosysApiWrapper.csproj", "{A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sipdotnet", "..\..\dll\Linphone\WRAPPER\sipdotnet-master\sipdotnet-master\sipdotnet.csproj", "{BCB250F8-F74C-4768-8833-0F13FC8659B8}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bria_API_CSharp_SampleApp_3.0", "..\..\dll\BRIA\Bria_API_CSharp_SampleApp_3-main\Bria_API_CSharp_SampleApp_3-main\Bria_API_SampleApp_Phone\Bria_API_CSharp_SampleApp_3.0.csproj", "{1F68E194-88A8-47F2-B9F9-20E092EFA30A}" @@ -76,8 +72,8 @@ Global {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Release|x86.ActiveCfg = Release|x86 {3B5EAEB2-0477-4899-A893-3049DD458B9B}.Release|x86.Build.0 = Release|x86 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Any CPU.ActiveCfg = Debug|x64 - {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 + {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|Mixed Platforms.Build.0 = Debug|x64 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x64.ActiveCfg = Debug|x64 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x64.Build.0 = Debug|x64 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Debug|x86.ActiveCfg = Debug|x86 @@ -136,7 +132,6 @@ Global {A734141E-2C4E-4D70-81E8-A88184282AF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {A734141E-2C4E-4D70-81E8-A88184282AF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {A734141E-2C4E-4D70-81E8-A88184282AF5}.Debug|x64.ActiveCfg = Debug|Any CPU - {A734141E-2C4E-4D70-81E8-A88184282AF5}.Debug|x64.Build.0 = Debug|Any CPU {A734141E-2C4E-4D70-81E8-A88184282AF5}.Debug|x86.ActiveCfg = Debug|Any CPU {A734141E-2C4E-4D70-81E8-A88184282AF5}.Debug|x86.Build.0 = Debug|Any CPU {A734141E-2C4E-4D70-81E8-A88184282AF5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -163,28 +158,11 @@ Global {2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Release|x64.Build.0 = Release|Any CPU {2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Release|x86.ActiveCfg = Release|Any CPU {2BBD7643-82A1-481F-A014-EB7FCDEED3B5}.Release|x86.Build.0 = Release|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Debug|x64.ActiveCfg = Debug|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Debug|x64.Build.0 = Debug|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Debug|x86.ActiveCfg = Debug|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Debug|x86.Build.0 = Debug|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Release|Any CPU.Build.0 = Release|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Release|x64.ActiveCfg = Release|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Release|x64.Build.0 = Release|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Release|x86.ActiveCfg = Release|Any CPU - {CB95CC0E-D73A-4D11-9FF8-197A392D831F}.Release|x86.Build.0 = Release|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Debug|Any CPU.Build.0 = Debug|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Debug|x64.ActiveCfg = Debug|Any CPU - {5193A729-058C-4C93-B7D3-0A228CA719CC}.Debug|x64.Build.0 = Debug|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Debug|x86.ActiveCfg = Debug|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Debug|x86.Build.0 = Debug|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -195,22 +173,6 @@ Global {5193A729-058C-4C93-B7D3-0A228CA719CC}.Release|x64.Build.0 = Release|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Release|x86.ActiveCfg = Release|Any CPU {5193A729-058C-4C93-B7D3-0A228CA719CC}.Release|x86.Build.0 = Release|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Debug|x64.ActiveCfg = Debug|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Debug|x64.Build.0 = Debug|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Debug|x86.ActiveCfg = Debug|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Debug|x86.Build.0 = Debug|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|Any CPU.Build.0 = Release|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|x64.ActiveCfg = Release|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|x64.Build.0 = Release|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|x86.ActiveCfg = Release|Any CPU - {A4A15E4A-9D83-4FD5-807B-63FC87CA4F0F}.Release|x86.Build.0 = Release|Any CPU {BCB250F8-F74C-4768-8833-0F13FC8659B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BCB250F8-F74C-4768-8833-0F13FC8659B8}.Debug|Any CPU.Build.0 = Debug|Any CPU {BCB250F8-F74C-4768-8833-0F13FC8659B8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU diff --git a/Aviso/Aviso.vbproj b/Aviso/Aviso.vbproj index 793b08d..88e3906 100644 --- a/Aviso/Aviso.vbproj +++ b/Aviso/Aviso.vbproj @@ -80,10 +80,11 @@ My Project\app.manifest - C817B38BF41513AE566EFC65D0884C0F91F49E37 + 34D75D5089806BE69485715D014CE0611D10E677 - Aviso_1_TemporaryKey.pfx + + false @@ -92,7 +93,7 @@ LocalIntranet - false + true false @@ -103,13 +104,18 @@ x64 bin\Debug\ + false AnyCPU false - Aviso_1_TemporaryKey.pfx + LME.pfx + + + bin\Release\ + x64 bin\Release\ @@ -144,6 +150,9 @@ ..\packages\DocumentFormat.OpenXml.2.7.2\lib\net46\DocumentFormat.OpenXml.dll + + ..\Gemeinsames\bin\Debug\Gemeinsames.dll + C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\GrapeCity.ActiveReports.dll @@ -1478,10 +1487,6 @@ {289bcd77-bc00-4ba1-95ed-a79176d99525} SDL - - {110c923b-cb02-4fd0-af24-95e0f0eeeff5} - Gemeinsames - @@ -1764,7 +1769,8 @@ - C:\VERAG\Zertifikate\signtool.exe sign /f D:\Andreas\Programmierung\VB\AVISO\Aviso\Aviso\Aviso_1_TemporaryKey.pfx /p BmWr501956 "Aviso.exe" + + diff --git a/Aviso/UsrCntlEssensbestellungen.vb b/Aviso/UsrCntlEssensbestellungen.vb index f19116f..f09b309 100644 --- a/Aviso/UsrCntlEssensbestellungen.vb +++ b/Aviso/UsrCntlEssensbestellungen.vb @@ -256,6 +256,8 @@ Public Class UsrCntlessensbestellungen Exit Sub End If + Dim mitarbeiter As New cMitarbeiter(cbxMitarbeiter._value) + essen = New cEssensbestellung(cbxMenu._value, cbxMitarbeiter._value, cbxGebäude._value, cbxAbteilung._value, cbxMitarbeiter.Text, txtAnmerkung.Text) @@ -357,6 +359,7 @@ Public Class UsrCntlessensbestellungen essen.eb_datum = CDate(dt.Rows(0).Item("MenuDateVon")) essen.eb_gebaeude = cbxGebäude._value + essen.eb_firma = mitarbeiter.getFirma If CheckBox1.Checked = False Then essen.eb_abgerechnet = False diff --git a/Aviso/frmATEZ_NCTS.Designer.vb b/Aviso/frmATEZ_NCTS.Designer.vb index 43a04ba..d02d3a0 100644 --- a/Aviso/frmATEZ_NCTS.Designer.vb +++ b/Aviso/frmATEZ_NCTS.Designer.vb @@ -73,6 +73,7 @@ Partial Class frmATEZ_NCTS Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.lblAnh = New System.Windows.Forms.Label() + Me.Button3 = New System.Windows.Forms.Button() Me.pnlHead.SuspendLayout() CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -97,6 +98,7 @@ Partial Class frmATEZ_NCTS ' Me.pnlHead.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.pnlHead.BackColor = System.Drawing.Color.White + Me.pnlHead.Controls.Add(Me.Button3) Me.pnlHead.Controls.Add(Me.Label2) Me.pnlHead.Controls.Add(Me.cboProzedur) Me.pnlHead.Controls.Add(Me.lblInfo) @@ -959,6 +961,15 @@ Partial Class frmATEZ_NCTS Me.lblAnh.TabIndex = 151 Me.lblAnh.Visible = False ' + 'Button3 + ' + Me.Button3.Location = New System.Drawing.Point(470, 575) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(111, 23) + Me.Button3.TabIndex = 152 + Me.Button3.Text = "alle Anh. selekt." + Me.Button3.UseVisualStyleBackColor = True + ' 'frmATEZ_NCTS ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1028,4 +1039,5 @@ Partial Class frmATEZ_NCTS Friend WithEvents Label2 As Label Friend WithEvents cboProzedur As VERAG_PROG_ALLGEMEIN.MyComboBox Friend WithEvents lblAnh As Label + Friend WithEvents Button3 As Button End Class diff --git a/Aviso/frmATEZ_NCTS.vb b/Aviso/frmATEZ_NCTS.vb index 7bd7741..1766d87 100644 --- a/Aviso/frmATEZ_NCTS.vb +++ b/Aviso/frmATEZ_NCTS.vb @@ -31,6 +31,7 @@ Public Class frmATEZ_NCTS Dim dgv As DataGridView = Nothing Dim atez_data As cATEZ_NCTS_DATA Dim atez = New cATEZ_NCTS_IN + Dim allSelected As Boolean = False Property BezugsNr As String = "" Property SENDUNG As VERAG_PROG_ALLGEMEIN.cSendungen @@ -203,13 +204,16 @@ Public Class frmATEZ_NCTS Return atezData.SAVE End If - If Not atez.setJsonPDF(atezData, dgvAnhaenge) Then - MsgBox("Fehler beim Erstellen der PDF-Daten!" & vbNewLine & "Vorgang abgebrochen!") - atezData.status = "Failure" - atezData.fehlerbeschreibung = "Fehler beim Erstellen der PDF-Daten!" - Return atezData.SAVE + If checkAttachment() Then + If Not atez.setJsonPDF(atezData, dgvAnhaenge) Then + MsgBox("Fehler beim Erstellen der PDF-Daten!" & vbNewLine & "Vorgang abgebrochen!") + atezData.status = "Failure" + atezData.fehlerbeschreibung = "Fehler beim Erstellen der PDF-Daten!" + Return atezData.SAVE + End If End If + Dim azetId = atez.SendRequestWithAuthHeader("application/json", failreDesc) If failreDesc <> "" Then @@ -307,6 +311,7 @@ Public Class frmATEZ_NCTS End Select initSeachboxes() + lblAnh.Visible = True @@ -616,11 +621,11 @@ Public Class frmATEZ_NCTS Next - If Not selectedDocuments Then - lblInfo.Text = "kein Anhang selektiert" - Cursor = Cursors.Default - Return selectedDocuments - End If + 'If Not selectedDocuments Then + ' lblInfo.Text = "kein Anhang selektiert" + ' Cursor = Cursors.Default + ' Return selectedDocuments + 'End If Return selectedDocuments @@ -745,12 +750,12 @@ Public Class frmATEZ_NCTS If dgvAnhaenge.Columns(e.ColumnIndex).Name = "anh_selekt" Then If Not IsDBNull(dgvAnhaenge.CurrentRow.Cells("anh_selekt").Value) AndAlso dgvAnhaenge.CurrentRow.Cells("anh_selekt").Value = True Then - countAnh += dgvAnhaenge.CurrentRow.Cells("anh_size").Value + countAnh += IIf(dgvAnhaenge.CurrentRow.Cells("anh_size").Value IsNot DBNull.Value, dgvAnhaenge.CurrentRow.Cells("anh_size").Value, 0) End If For Each Row As DataGridViewRow In dgvAnhaenge.Rows If Row.Cells("anh_selekt").Value IsNot DBNull.Value AndAlso Row.Cells("anh_selekt").Value = True AndAlso Row.Cells("anh_size").Value IsNot DBNull.Value Then - countAnh += Row.Cells("anh_size").Value + countAnh += IIf(Row.Cells("anh_size").Value IsNot DBNull.Value, Row.Cells("anh_size").Value, 0) End If Next @@ -763,4 +768,21 @@ Public Class frmATEZ_NCTS End Sub + + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + If dgvAnhaenge.RowCount > 0 Then + Dim countAnh As Double = 0 + For Each Row As DataGridViewRow In dgvAnhaenge.Rows + If allSelected Then + Row.Cells("anh_selekt").Value = True + countAnh += IIf(Row.Cells("anh_size").Value IsNot DBNull.Value, Row.Cells("anh_size").Value, 0) + Else + Row.Cells("anh_selekt").Value = False + countAnh = 0 + End If + Next + allSelected = Not allSelected + lblAnh.Text = "Anhang in MB: " & countAnh.ToString + End If + End Sub End Class \ No newline at end of file diff --git a/Aviso/frmBundesanzeigerZollTarif.vb b/Aviso/frmBundesanzeigerZollTarif.vb index 49f4575..a1eea1e 100644 --- a/Aviso/frmBundesanzeigerZollTarif.vb +++ b/Aviso/frmBundesanzeigerZollTarif.vb @@ -23,6 +23,7 @@ lblError.Visible = False WebBrowser.Navigate(New Uri(url)) WebBrowser.AllowNavigation = True + WebBrowser.ScriptErrorsSuppressed = True 'Hinweismeldungen bzgl sicherer Verbindung unterbinden End Sub diff --git a/Aviso/frmDigicust.vb b/Aviso/frmDigicust.vb index eb05af9..3020f90 100644 --- a/Aviso/frmDigicust.vb +++ b/Aviso/frmDigicust.vb @@ -81,7 +81,6 @@ Public Class frmDigicust Try If Not checkAttachment() Then - Exit Sub End If @@ -299,28 +298,34 @@ Public Class frmDigicust getBezugsnr(BezugsNr) - txtLKWId.Text = AVISO.LKW_Nr + + If AVISO.LKW_Nr.Length > 10 Then + txtLKWId.Text = AVISO.LKW_Nr.Substring(0, 10) + Else + txtLKWId.Text = AVISO.LKW_Nr + End If + txtLWKLand.Text = AVISO.LKW_Nationalitaet - If If(SENDUNG.tblSnd_Vorpapier, "") <> "" Then - txtVorpapier.Text = SENDUNG.tblSnd_Vorpapier - txtVorpapierT.Text = cDy_ART + If If(SENDUNG.tblSnd_Vorpapier, "") <> "" Then + txtVorpapier.Text = SENDUNG.tblSnd_Vorpapier + txtVorpapierT.Text = cDy_ART + End If + + If SENDUNG.tblSnd_EmpfaengerKdNr > -1 Then + UsrCntl_Consignee.kdFirma.initKdBox(Me) + UsrCntl_Consignee.kdFirma.KdNr = SENDUNG.tblSnd_EmpfaengerKdNr + End If + + + If SENDUNG.tblSnd_AbsenderKdNr > -1 Then + usrCntl_consignor.kdFirma.initKdBox(Me) + usrCntl_consignor.kdFirma.KdNr = SENDUNG.tblSnd_AbsenderKdNr + End If + End If - If SENDUNG.tblSnd_EmpfaengerKdNr > -1 Then - UsrCntl_Consignee.kdFirma.initKdBox(Me) - UsrCntl_Consignee.kdFirma.KdNr = SENDUNG.tblSnd_EmpfaengerKdNr - End If - - - If SENDUNG.tblSnd_AbsenderKdNr > -1 Then - usrCntl_consignor.kdFirma.initKdBox(Me) - usrCntl_consignor.kdFirma.KdNr = SENDUNG.tblSnd_AbsenderKdNr - End If - - End If - End Sub @@ -420,9 +425,28 @@ Public Class frmDigicust If cboStammreferenz._value = "" Then lblInfo.Text = "Stammref. auswählen!" + cboStammreferenz.Focus() Return False End If + If txtLKWId.TextLength > 10 Then + lblInfo.Text = "LKW-Kennzeichen zu lang (max 10 Stellen)." + txtLKWId.Focus() + Return False + End If + + + If txtVorpapierT.Text > 2 Then + lblInfo.Text = "Vopapier-Code zu lang (max 2 Stellen)." + txtVorpapierT.Focus() + Return False + End If + + If txtVorpapier.Text > 30 Then + lblInfo.Text = "Vopapier zu lang (max 30 Stellen)." + txtVorpapier.Focus() + Return False + End If 'TODO Return True diff --git a/Aviso/frmEssensbestellungenAdministration.vb b/Aviso/frmEssensbestellungenAdministration.vb index fe95109..fe48b04 100644 --- a/Aviso/frmEssensbestellungenAdministration.vb +++ b/Aviso/frmEssensbestellungenAdministration.vb @@ -43,7 +43,7 @@ Public Class frmEssensbestellungenAdministration Private Sub loadBestellungen() - Dim SQLString As String = "SELECT [eb_mitid] , [eb_mitname] , [eb_kw] , [eb_gebaeude],[eb_abteilung],[eb_montag],[eb_dienstag],[eb_mittwoch], + Dim SQLString As String = "SELECT [eb_mitid] , [eb_mitname] ,[eb_firma] , [eb_kw] , [eb_gebaeude],[eb_abteilung],[eb_montag],[eb_dienstag],[eb_mittwoch], [eb_donnerstag] ,[eb_freitag],[eb_datum],[eb_preis], [eb_anmerkung],[eb_storniert],[eb_storniert_am],[eb_abgerechnet],[eb_abgerechnet_am], [eb_gesendet], [eb_gesendet_am] FROM [tblEssensbestellungen] WHERE 1=1" @@ -66,6 +66,8 @@ Public Class frmEssensbestellungenAdministration .Columns("eb_mitname").HeaderText = "Mitarbeiter" .Columns("eb_mitname").AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill .Columns("eb_abteilung").Visible = False + .Columns("eb_firma").Width = 80 + .Columns("eb_firma").HeaderText = "Firma" .Columns("eb_datum").Width = 80 .Columns("eb_datum").HeaderText = "Datum" .Columns("eb_montag").Width = 80 @@ -447,7 +449,7 @@ Public Class frmEssensbestellungenAdministration Dim TextHTMLtable = "" TextHTMLtable &= "" - TextHTMLtable &= "" + TextHTMLtable &= "" If sender.Text = "Email" Then @@ -469,6 +471,7 @@ Public Class frmEssensbestellungenAdministration TextHTMLtable &= "" TextHTMLtable &= "" TextHTMLtable &= "" + TextHTMLtable &= "" TextHTMLtable &= "" If row("ID") <> 0 Then @@ -499,6 +502,7 @@ Public Class frmEssensbestellungenAdministration TextHTMLtable &= "" TextHTMLtable &= "" TextHTMLtable &= "" + TextHTMLtable &= "" TextHTMLtable &= "" Next @@ -614,7 +618,7 @@ Public Class frmEssensbestellungenAdministration ''LEFT([eb_kw],5) Dim SQLStringBEstellungen As String = "SELECT [eb_mitname] as Name ,[eb_mitid] as ID , [eb_kw] as KW , [eb_gebaeude] as Gebaeude ,[eb_abteilung] as Abteilung ,[eb_montag] As Montag ,[eb_dienstag] As Dienstag,[eb_mittwoch] As Mittwoch, - [eb_donnerstag] As Donnerstag , [eb_freitag] As Freitag, [eb_anmerkung] As Anmerkung , [eb_datum] As Datum , [eb_storniert] as Storniert + [eb_donnerstag] As Donnerstag , [eb_freitag] As Freitag, [eb_anmerkung] As Anmerkung , [eb_datum] As Datum , [eb_storniert] as Storniert, [eb_firma] as Firma FROM [tblEssensbestellungen] WHERE eb_kw = '" & cbxMailKW._value & "' AND eb_gebaeude = '" & cbxMailGebäude._value & "' AND ISNULL(eb_storniert,1)=0 Order by eb_datum" @@ -704,6 +708,7 @@ Public Class frmEssensbestellungenAdministration R("Anmerkung") = DBNull.Value R("Datum") = DBNull.Value R("Storniert") = DBNull.Value + R("Firma") = DBNull.Value R("Montag") = String.Join(" ", resultMontag) R("Dienstag") = String.Join(" ", resultDienstag) R("Mittwoch") = String.Join(" ", resultMittwoch) @@ -858,6 +863,7 @@ Public Class frmEssensbestellungenAdministration drFirst.Item("eb_gebaeude") = " " drFirst.Item("eb_abteilung") = " " drFirst.Item("eb_preis") = 0 + drFirst.Item("eb_firma") = " " dt.Rows.InsertAt(drFirst, 0) @@ -868,6 +874,7 @@ Public Class frmEssensbestellungenAdministration drLast.Item("eb_gebaeude") = " " drLast.Item("eb_abteilung") = " " drLast.Item("eb_preis") = txtMarkierteDS.Text.Replace("€", "") + drLast.Item("eb_firma") = " " dt.Rows.InsertAt(drLast, dt.Rows.Count) dt.Columns.Remove("eb_mitid") diff --git a/Aviso/frmHauptfenster.Designer.vb b/Aviso/frmHauptfenster.Designer.vb index d45f935..84d5352 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 DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle25 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle26 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() + Dim DataGridViewCellStyle27 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) @@ -55,6 +55,7 @@ Partial Class frmHauptfenster Me.OptionenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ZeilenInFarbeEinausToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.BerechtigungenNeuLadenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.FenstergrößeVariabelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.StandorteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AvisoTVToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.InfoTextÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -229,7 +230,6 @@ Partial Class frmHauptfenster Me.lblFimaAviso = New System.Windows.Forms.Label() Me.Button11 = New System.Windows.Forms.Button() Me.btnMAVerzeichnis = New System.Windows.Forms.Button() - Me.btnMitarbeiterKonto = New VERAG_PROG_ALLGEMEIN.FlatButton() Me.Button9 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() Me.Button5 = New System.Windows.Forms.Button() @@ -276,20 +276,16 @@ Partial Class frmHauptfenster Me.cntxtAtilla = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripMenuItem17 = New System.Windows.Forms.ToolStripMenuItem() Me.SplitContainer3 = New System.Windows.Forms.SplitContainer() - Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen() Me.pnl = New System.Windows.Forms.Panel() Me.Button10 = New System.Windows.Forms.Button() - Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel6 = New System.Windows.Forms.Panel() Me.cbx_My_Brexit = New System.Windows.Forms.CheckBox() Me.btnColor = New System.Windows.Forms.Button() Me.lblMeineAviso = New System.Windows.Forms.Label() - Me.cboMy_Grenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblMySnd_Grenzstelle = New System.Windows.Forms.Label() Me.cbx_My_LKW = New System.Windows.Forms.CheckBox() Me.cboMy_QS = New System.Windows.Forms.CheckBox() Me.cboMy_VB = New System.Windows.Forms.CheckBox() - Me.cboMyAvisoAnzeige = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblMySND_Anzeige = New System.Windows.Forms.Label() Me.lblAkte = New System.Windows.Forms.Label() Me.btnClose = New System.Windows.Forms.Button() @@ -310,22 +306,16 @@ Partial Class frmHauptfenster Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() Me.pnlDetailsLinks = New System.Windows.Forms.Panel() Me.splitMain = New System.Windows.Forms.SplitContainer() - Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) Me.Panel1 = New System.Windows.Forms.Panel() - Me.txtBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() Me.Label10 = New System.Windows.Forms.Label() - Me.cboImEx = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label21 = New System.Windows.Forms.Label() Me.cbxCluster = New System.Windows.Forms.CheckBox() - Me.cboTeams = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.lblErweitereSuche = New System.Windows.Forms.LinkLabel() Me.Label16 = New System.Windows.Forms.Label() Me.Label8 = New System.Windows.Forms.Label() Me.lblEintraege = New System.Windows.Forms.Label() - Me.cboGrenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.Label4 = New System.Windows.Forms.Label() Me.pnlTime = New System.Windows.Forms.Panel() - Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.pnlSearch = New System.Windows.Forms.Panel() Me.lblAbsender = New System.Windows.Forms.Label() Me.txtAbsender = New System.Windows.Forms.TextBox() @@ -346,7 +336,6 @@ Partial Class frmHauptfenster Me.Button4 = New System.Windows.Forms.Button() Me.lblErwEmpfänger = New System.Windows.Forms.Label() Me.txtEmpfänger = New System.Windows.Forms.TextBox() - Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox() Me.txtAbfertigungsnummer = New System.Windows.Forms.TextBox() Me.lblErwFilialePos = New System.Windows.Forms.Label() Me.lblErwAuftraggeber = New System.Windows.Forms.Label() @@ -378,10 +367,25 @@ Partial Class frmHauptfenster Me.ToolStripMenuItem19 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem20 = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripMenuItem21 = New System.Windows.Forms.ToolStripMenuItem() - Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() Me.Panel3 = New System.Windows.Forms.Panel() Me.Panel4 = New System.Windows.Forms.Panel() - Me.FenstergrößeVariabelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.UsrCntlTestsystem1 = New VERAG_PROG_ALLGEMEIN.usrCntlTestsystem() + Me.gridAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.txtBestimmungszollstelle = New VERAG_PROG_ALLGEMEIN.MySearchBox() + Me.cboImEx = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboTeams = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboGrenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.MyComboBox1 = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.gridMyAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components) + Me.cboMy_Grenzstelle = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.cboMyAvisoAnzeige = New VERAG_PROG_ALLGEMEIN.MyComboBox() + Me.btnMitarbeiterKonto = New VERAG_PROG_ALLGEMEIN.FlatButton() + Me.btnZertifikate = New System.Windows.Forms.Button() + Me.UsrCntlBenachrichtigungen1 = New AVISO.usrCntlBenachrichtigungen() + Me.cntVerag = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.ZertifikateToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.HomepageToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.conMenuAviso.SuspendLayout() Me.MenuStrip1.SuspendLayout() Me.pnlDetailsRechts.SuspendLayout() @@ -401,7 +405,6 @@ Partial Class frmHauptfenster Me.SplitContainer3.Panel2.SuspendLayout() Me.SplitContainer3.SuspendLayout() Me.pnl.SuspendLayout() - CType(Me.gridMyAviso, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel6.SuspendLayout() Me.tbcntrAviso.SuspendLayout() CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -413,7 +416,6 @@ Partial Class frmHauptfenster Me.splitMain.Panel1.SuspendLayout() Me.splitMain.Panel2.SuspendLayout() Me.splitMain.SuspendLayout() - CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.pnlTime.SuspendLayout() Me.pnlSearch.SuspendLayout() @@ -422,6 +424,9 @@ Partial Class frmHauptfenster Me.ctxtFarben.SuspendLayout() Me.Panel3.SuspendLayout() Me.Panel4.SuspendLayout() + CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.gridMyAviso, System.ComponentModel.ISupportInitialize).BeginInit() + Me.cntVerag.SuspendLayout() Me.SuspendLayout() ' 'mnuInfo @@ -565,6 +570,12 @@ Partial Class frmHauptfenster Me.BerechtigungenNeuLadenToolStripMenuItem.Size = New System.Drawing.Size(213, 22) Me.BerechtigungenNeuLadenToolStripMenuItem.Text = "Berechtigungen neu laden" ' + 'FenstergrößeVariabelToolStripMenuItem + ' + Me.FenstergrößeVariabelToolStripMenuItem.Name = "FenstergrößeVariabelToolStripMenuItem" + Me.FenstergrößeVariabelToolStripMenuItem.Size = New System.Drawing.Size(213, 22) + Me.FenstergrößeVariabelToolStripMenuItem.Text = "Fenstergröße variabel" + ' 'StandorteToolStripMenuItem ' Me.StandorteToolStripMenuItem.Name = "StandorteToolStripMenuItem" @@ -1744,24 +1755,6 @@ Partial Class frmHauptfenster Me.btnMAVerzeichnis.UseVisualStyleBackColor = True Me.btnMAVerzeichnis.Visible = False ' - 'btnMitarbeiterKonto - ' - Me.btnMitarbeiterKonto.allowBorder = False - Me.btnMitarbeiterKonto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnMitarbeiterKonto.BackColor = System.Drawing.Color.White - Me.btnMitarbeiterKonto.FlatAppearance.BorderSize = 0 - Me.btnMitarbeiterKonto.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnMitarbeiterKonto.ForeColor = System.Drawing.Color.Black - Me.btnMitarbeiterKonto.Image = Global.AVISO.My.Resources.Resources.mitarbeiter_s - Me.btnMitarbeiterKonto.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.btnMitarbeiterKonto.Location = New System.Drawing.Point(1109, -6) - Me.btnMitarbeiterKonto.Name = "btnMitarbeiterKonto" - Me.btnMitarbeiterKonto.Size = New System.Drawing.Size(137, 61) - Me.btnMitarbeiterKonto.TabIndex = 86 - Me.btnMitarbeiterKonto.Text = "Andreas Luxbauer" - Me.btnMitarbeiterKonto.TextAlign = System.Drawing.ContentAlignment.BottomCenter - Me.btnMitarbeiterKonto.UseVisualStyleBackColor = False - ' 'Button9 ' Me.Button9.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -2016,7 +2009,7 @@ Partial Class frmHauptfenster Me.Button7.ImageAlign = System.Drawing.ContentAlignment.MiddleRight Me.Button7.Location = New System.Drawing.Point(5, 21) Me.Button7.Name = "Button7" - Me.Button7.Size = New System.Drawing.Size(121, 33) + Me.Button7.Size = New System.Drawing.Size(121, 25) Me.Button7.TabIndex = 2 Me.Button7.TabStop = False Me.Button7.Text = "Umrechnungskurse" @@ -2029,9 +2022,9 @@ Partial Class frmHauptfenster Me.btnZollwebseiten.ForeColor = System.Drawing.Color.Black Me.btnZollwebseiten.Image = CType(resources.GetObject("btnZollwebseiten.Image"), System.Drawing.Image) Me.btnZollwebseiten.ImageAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnZollwebseiten.Location = New System.Drawing.Point(5, 57) + Me.btnZollwebseiten.Location = New System.Drawing.Point(5, 52) Me.btnZollwebseiten.Name = "btnZollwebseiten" - Me.btnZollwebseiten.Size = New System.Drawing.Size(121, 33) + Me.btnZollwebseiten.Size = New System.Drawing.Size(121, 25) Me.btnZollwebseiten.TabIndex = 0 Me.btnZollwebseiten.TabStop = False Me.btnZollwebseiten.Text = "Zoll-Webseiten" @@ -2237,6 +2230,7 @@ Partial Class frmHauptfenster ' 'Panel2 ' + Me.Panel2.Controls.Add(Me.btnZertifikate) Me.Panel2.Controls.Add(Me.Label7) Me.Panel2.Controls.Add(Me.lblErrVermerk) Me.Panel2.Controls.Add(Me.Button7) @@ -2371,15 +2365,6 @@ Partial Class frmHauptfenster Me.SplitContainer3.SplitterDistance = 158 Me.SplitContainer3.TabIndex = 3 ' - 'UsrCntlBenachrichtigungen1 - ' - Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill - 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.TabIndex = 0 - ' 'pnl ' Me.pnl.Controls.Add(Me.Button10) @@ -2405,50 +2390,6 @@ Partial Class frmHauptfenster Me.Button10.Text = "<" Me.Button10.UseVisualStyleBackColor = False ' - 'gridMyAviso - ' - Me.gridMyAviso.AKTUALISIERUNGS_INTERVALL = -1 - Me.gridMyAviso.AllowUserToAddRows = False - Me.gridMyAviso.AllowUserToDeleteRows = False - Me.gridMyAviso.AllowUserToOrderColumns = True - Me.gridMyAviso.AllowUserToResizeRows = False - DataGridViewCellStyle1.BackColor = System.Drawing.Color.Azure - Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1 - 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 - 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 - 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 - Me.gridMyAviso.RowHeadersVisible = False - Me.gridMyAviso.RowHeadersWidth = 62 - Me.gridMyAviso.Size = New System.Drawing.Size(488, 279) - Me.gridMyAviso.TabIndex = 0 - ' 'Panel6 ' Me.Panel6.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) @@ -2504,23 +2445,6 @@ Partial Class frmHauptfenster Me.lblMeineAviso.TabIndex = 0 Me.lblMeineAviso.Text = "Meine Sendungen:" ' - 'cboMy_Grenzstelle - ' - Me.cboMy_Grenzstelle._allowedValuesFreiText = Nothing - Me.cboMy_Grenzstelle._allowFreiText = False - Me.cboMy_Grenzstelle._value = "" - Me.cboMy_Grenzstelle.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cboMy_Grenzstelle.BackColor = System.Drawing.Color.WhiteSmoke - Me.cboMy_Grenzstelle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboMy_Grenzstelle.DropDownWidth = 120 - 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.Name = "cboMy_Grenzstelle" - Me.cboMy_Grenzstelle.Size = New System.Drawing.Size(64, 21) - Me.cboMy_Grenzstelle.TabIndex = 26 - ' 'lblMySnd_Grenzstelle ' Me.lblMySnd_Grenzstelle.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -2572,22 +2496,6 @@ Partial Class frmHauptfenster Me.cboMy_VB.ThreeState = True Me.cboMy_VB.UseVisualStyleBackColor = True ' - 'cboMyAvisoAnzeige - ' - Me.cboMyAvisoAnzeige._allowedValuesFreiText = Nothing - Me.cboMyAvisoAnzeige._allowFreiText = False - Me.cboMyAvisoAnzeige._value = "" - Me.cboMyAvisoAnzeige.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.cboMyAvisoAnzeige.BackColor = System.Drawing.Color.WhiteSmoke - Me.cboMyAvisoAnzeige.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - 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.Name = "cboMyAvisoAnzeige" - Me.cboMyAvisoAnzeige.Size = New System.Drawing.Size(127, 21) - Me.cboMyAvisoAnzeige.TabIndex = 21 - ' 'lblMySND_Anzeige ' Me.lblMySND_Anzeige.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -2850,60 +2758,6 @@ Partial Class frmHauptfenster Me.splitMain.SplitterDistance = 287 Me.splitMain.TabIndex = 0 ' - 'gridAviso - ' - Me.gridAviso.AKTUALISIERUNGS_INTERVALL = -1 - 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 - 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 - 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 - 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 - 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 - 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.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)) @@ -2937,32 +2791,6 @@ Partial Class frmHauptfenster Me.Panel1.Size = New System.Drawing.Size(815, 248) Me.Panel1.TabIndex = 2 ' - 'txtBestimmungszollstelle - ' - Me.txtBestimmungszollstelle._allowFreitext = False - Me.txtBestimmungszollstelle._AllowSetValue = False - Me.txtBestimmungszollstelle._allowSpaceAsSplitter = False - Me.txtBestimmungszollstelle._autoSizeGross = False - Me.txtBestimmungszollstelle._hideIfListEmpty = True - Me.txtBestimmungszollstelle._value = Nothing - Me.txtBestimmungszollstelle.conn_art = "FMZOLL" - Me.txtBestimmungszollstelle.dgvpos = "LEFT" - Me.txtBestimmungszollstelle.DISPLAY_PARAM = Nothing - Me.txtBestimmungszollstelle.INVISIBLE_COLUMNS = Nothing - Me.txtBestimmungszollstelle.key_visible = False - Me.txtBestimmungszollstelle.KEYPARAM = Nothing - Me.txtBestimmungszollstelle.Location = New System.Drawing.Point(379, 55) - Me.txtBestimmungszollstelle.MaxLength = 50 - Me.txtBestimmungszollstelle.Name = "txtBestimmungszollstelle" - Me.txtBestimmungszollstelle.searchActive = True - Me.txtBestimmungszollstelle.Size = New System.Drawing.Size(211, 20) - Me.txtBestimmungszollstelle.SQL_ORDER_BY = Nothing - Me.txtBestimmungszollstelle.SQL_SELECT = Nothing - Me.txtBestimmungszollstelle.SQL_WHERE = Nothing - Me.txtBestimmungszollstelle.SQL_WhereParamList = Nothing - Me.txtBestimmungszollstelle.TabIndex = 25 - Me.txtBestimmungszollstelle.usrcntl = Nothing - ' 'Label10 ' Me.Label10.AutoSize = True @@ -2973,22 +2801,6 @@ Partial Class frmHauptfenster Me.Label10.TabIndex = 26 Me.Label10.Text = "Zollamt:" ' - 'cboImEx - ' - Me.cboImEx._allowedValuesFreiText = Nothing - Me.cboImEx._allowFreiText = False - Me.cboImEx._value = "" - Me.cboImEx.BackColor = System.Drawing.Color.WhiteSmoke - Me.cboImEx.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboImEx.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.cboImEx.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cboImEx.FormattingEnabled = True - Me.cboImEx.Items.AddRange(New Object() {"ALLE", "SUB", "SBG", "WAI", "NKD"}) - Me.cboImEx.Location = New System.Drawing.Point(828, 3) - Me.cboImEx.Name = "cboImEx" - Me.cboImEx.Size = New System.Drawing.Size(78, 24) - Me.cboImEx.TabIndex = 24 - ' 'Label21 ' Me.Label21.AutoSize = True @@ -3012,22 +2824,6 @@ Partial Class frmHauptfenster Me.cbxCluster.Text = "Firmenverbund" Me.cbxCluster.UseVisualStyleBackColor = True ' - 'cboTeams - ' - Me.cboTeams._allowedValuesFreiText = Nothing - Me.cboTeams._allowFreiText = False - Me.cboTeams._value = "" - Me.cboTeams.BackColor = System.Drawing.Color.WhiteSmoke - Me.cboTeams.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboTeams.DropDownWidth = 200 - Me.cboTeams.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.cboTeams.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cboTeams.FormattingEnabled = True - Me.cboTeams.Location = New System.Drawing.Point(379, 3) - Me.cboTeams.Name = "cboTeams" - Me.cboTeams.Size = New System.Drawing.Size(107, 24) - Me.cboTeams.TabIndex = 19 - ' 'lblErweitereSuche ' Me.lblErweitereSuche.AutoSize = True @@ -3073,23 +2869,6 @@ Partial Class frmHauptfenster Me.lblEintraege.Text = "0 Einträge" Me.lblEintraege.TextAlign = System.Drawing.ContentAlignment.TopRight ' - 'cboGrenzstelle - ' - Me.cboGrenzstelle._allowedValuesFreiText = Nothing - Me.cboGrenzstelle._allowFreiText = False - Me.cboGrenzstelle._value = "" - Me.cboGrenzstelle.BackColor = System.Drawing.Color.WhiteSmoke - Me.cboGrenzstelle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboGrenzstelle.DropDownWidth = 200 - Me.cboGrenzstelle.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.cboGrenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cboGrenzstelle.FormattingEnabled = True - Me.cboGrenzstelle.Items.AddRange(New Object() {"ALLE", "SUB", "SBG", "WAI", "NKD", "NEU", "AMB", "???"}) - Me.cboGrenzstelle.Location = New System.Drawing.Point(379, 30) - Me.cboGrenzstelle.Name = "cboGrenzstelle" - Me.cboGrenzstelle.Size = New System.Drawing.Size(107, 24) - Me.cboGrenzstelle.TabIndex = 13 - ' 'Label4 ' Me.Label4.AutoSize = True @@ -3117,22 +2896,6 @@ Partial Class frmHauptfenster Me.pnlTime.Size = New System.Drawing.Size(437, 57) Me.pnlTime.TabIndex = 12 ' - 'MyComboBox1 - ' - Me.MyComboBox1._allowedValuesFreiText = Nothing - Me.MyComboBox1._allowFreiText = False - Me.MyComboBox1._value = "" - Me.MyComboBox1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) - Me.MyComboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.MyComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) - Me.MyComboBox1.ForeColor = System.Drawing.Color.White - Me.MyComboBox1.FormattingEnabled = True - Me.MyComboBox1.Location = New System.Drawing.Point(46, 1) - Me.MyComboBox1.MaxLength = 4 - Me.MyComboBox1.Name = "MyComboBox1" - Me.MyComboBox1.Size = New System.Drawing.Size(98, 21) - Me.MyComboBox1.TabIndex = 7 - ' 'pnlSearch ' Me.pnlSearch.Controls.Add(Me.lblAbsender) @@ -3361,20 +3124,6 @@ Partial Class frmHauptfenster Me.txtEmpfänger.Size = New System.Drawing.Size(236, 23) Me.txtEmpfänger.TabIndex = 3 ' - 'cboFiliale - ' - Me.cboFiliale._allowedValuesFreiText = Nothing - Me.cboFiliale._allowFreiText = False - Me.cboFiliale._value = "" - Me.cboFiliale.DropDownWidth = 300 - Me.cboFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cboFiliale.FormattingEnabled = True - Me.cboFiliale.Location = New System.Drawing.Point(389, 13) - Me.cboFiliale.MaxLength = 4 - Me.cboFiliale.Name = "cboFiliale" - Me.cboFiliale.Size = New System.Drawing.Size(70, 24) - Me.cboFiliale.TabIndex = 3 - ' 'txtAbfertigungsnummer ' Me.txtAbfertigungsnummer.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -3617,17 +3366,6 @@ Partial Class frmHauptfenster Me.ToolStripMenuItem21.Size = New System.Drawing.Size(121, 22) Me.ToolStripMenuItem21.Text = "GELB" ' - 'UsrCntlTestsystem1 - ' - Me.UsrCntlTestsystem1.BackColor = System.Drawing.Color.White - Me.UsrCntlTestsystem1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.UsrCntlTestsystem1.ForeColor = System.Drawing.Color.Red - Me.UsrCntlTestsystem1.Location = New System.Drawing.Point(632, -1) - Me.UsrCntlTestsystem1.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6) - Me.UsrCntlTestsystem1.Name = "UsrCntlTestsystem1" - Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) - Me.UsrCntlTestsystem1.TabIndex = 8 - ' 'Panel3 ' Me.Panel3.Controls.Add(Me.Panel4) @@ -3649,11 +3387,312 @@ Partial Class frmHauptfenster Me.Panel4.Size = New System.Drawing.Size(170, 25) Me.Panel4.TabIndex = 4 ' - 'FenstergrößeVariabelToolStripMenuItem + 'UsrCntlTestsystem1 ' - Me.FenstergrößeVariabelToolStripMenuItem.Name = "FenstergrößeVariabelToolStripMenuItem" - Me.FenstergrößeVariabelToolStripMenuItem.Size = New System.Drawing.Size(213, 22) - Me.FenstergrößeVariabelToolStripMenuItem.Text = "Fenstergröße variabel" + Me.UsrCntlTestsystem1.BackColor = System.Drawing.Color.White + Me.UsrCntlTestsystem1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.UsrCntlTestsystem1.ForeColor = System.Drawing.Color.Red + Me.UsrCntlTestsystem1.Location = New System.Drawing.Point(632, -1) + Me.UsrCntlTestsystem1.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6) + Me.UsrCntlTestsystem1.Name = "UsrCntlTestsystem1" + Me.UsrCntlTestsystem1.Size = New System.Drawing.Size(152, 28) + Me.UsrCntlTestsystem1.TabIndex = 8 + ' + 'gridAviso + ' + Me.gridAviso.AKTUALISIERUNGS_INTERVALL = -1 + Me.gridAviso.AllowUserToAddRows = False + Me.gridAviso.AllowUserToDeleteRows = False + Me.gridAviso.AllowUserToResizeRows = False + DataGridViewCellStyle19.BackColor = System.Drawing.Color.Azure + DataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19 + Me.gridAviso.BackgroundColor = System.Drawing.Color.DarkGray + Me.gridAviso.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable + DataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle20.BackColor = System.Drawing.Color.LightBlue + DataGridViewCellStyle20.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle20 + Me.gridAviso.ColumnHeadersHeight = 25 + Me.gridAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing + DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.DefaultCellStyle = DataGridViewCellStyle21 + 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 + DataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle22 + Me.gridAviso.RowHeadersVisible = False + Me.gridAviso.RowHeadersWidth = 62 + Me.gridAviso.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing + DataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridAviso.RowsDefaultCellStyle = DataGridViewCellStyle23 + 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.TabIndex = 1 + Me.gridAviso.TabStop = False + ' + 'txtBestimmungszollstelle + ' + Me.txtBestimmungszollstelle._allowFreitext = False + Me.txtBestimmungszollstelle._AllowSetValue = False + Me.txtBestimmungszollstelle._allowSpaceAsSplitter = False + Me.txtBestimmungszollstelle._autoSizeGross = False + Me.txtBestimmungszollstelle._hideIfListEmpty = True + Me.txtBestimmungszollstelle._value = Nothing + Me.txtBestimmungszollstelle.conn_art = "FMZOLL" + Me.txtBestimmungszollstelle.dgvpos = "LEFT" + Me.txtBestimmungszollstelle.DISPLAY_PARAM = Nothing + Me.txtBestimmungszollstelle.INVISIBLE_COLUMNS = Nothing + Me.txtBestimmungszollstelle.key_visible = False + Me.txtBestimmungszollstelle.KEYPARAM = Nothing + Me.txtBestimmungszollstelle.Location = New System.Drawing.Point(379, 55) + Me.txtBestimmungszollstelle.MaxLength = 50 + Me.txtBestimmungszollstelle.Name = "txtBestimmungszollstelle" + Me.txtBestimmungszollstelle.searchActive = True + Me.txtBestimmungszollstelle.Size = New System.Drawing.Size(211, 20) + Me.txtBestimmungszollstelle.SQL_ORDER_BY = Nothing + Me.txtBestimmungszollstelle.SQL_SELECT = Nothing + Me.txtBestimmungszollstelle.SQL_WHERE = Nothing + Me.txtBestimmungszollstelle.SQL_WhereParamList = Nothing + Me.txtBestimmungszollstelle.TabIndex = 25 + Me.txtBestimmungszollstelle.usrcntl = Nothing + ' + 'cboImEx + ' + Me.cboImEx._allowedValuesFreiText = Nothing + Me.cboImEx._allowFreiText = False + Me.cboImEx._value = "" + Me.cboImEx.BackColor = System.Drawing.Color.WhiteSmoke + Me.cboImEx.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboImEx.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cboImEx.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboImEx.FormattingEnabled = True + Me.cboImEx.Items.AddRange(New Object() {"ALLE", "SUB", "SBG", "WAI", "NKD"}) + Me.cboImEx.Location = New System.Drawing.Point(828, 3) + Me.cboImEx.Name = "cboImEx" + Me.cboImEx.Size = New System.Drawing.Size(78, 24) + Me.cboImEx.TabIndex = 24 + ' + 'cboTeams + ' + Me.cboTeams._allowedValuesFreiText = Nothing + Me.cboTeams._allowFreiText = False + Me.cboTeams._value = "" + Me.cboTeams.BackColor = System.Drawing.Color.WhiteSmoke + Me.cboTeams.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboTeams.DropDownWidth = 200 + Me.cboTeams.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cboTeams.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboTeams.FormattingEnabled = True + Me.cboTeams.Location = New System.Drawing.Point(379, 3) + Me.cboTeams.Name = "cboTeams" + Me.cboTeams.Size = New System.Drawing.Size(107, 24) + Me.cboTeams.TabIndex = 19 + ' + 'cboGrenzstelle + ' + Me.cboGrenzstelle._allowedValuesFreiText = Nothing + Me.cboGrenzstelle._allowFreiText = False + Me.cboGrenzstelle._value = "" + Me.cboGrenzstelle.BackColor = System.Drawing.Color.WhiteSmoke + Me.cboGrenzstelle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboGrenzstelle.DropDownWidth = 200 + Me.cboGrenzstelle.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.cboGrenzstelle.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboGrenzstelle.FormattingEnabled = True + Me.cboGrenzstelle.Items.AddRange(New Object() {"ALLE", "SUB", "SBG", "WAI", "NKD", "NEU", "AMB", "???"}) + Me.cboGrenzstelle.Location = New System.Drawing.Point(379, 30) + Me.cboGrenzstelle.Name = "cboGrenzstelle" + Me.cboGrenzstelle.Size = New System.Drawing.Size(107, 24) + Me.cboGrenzstelle.TabIndex = 13 + ' + 'MyComboBox1 + ' + Me.MyComboBox1._allowedValuesFreiText = Nothing + Me.MyComboBox1._allowFreiText = False + Me.MyComboBox1._value = "" + Me.MyComboBox1.BackColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.MyComboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.MyComboBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!) + Me.MyComboBox1.ForeColor = System.Drawing.Color.White + Me.MyComboBox1.FormattingEnabled = True + Me.MyComboBox1.Location = New System.Drawing.Point(46, 1) + Me.MyComboBox1.MaxLength = 4 + Me.MyComboBox1.Name = "MyComboBox1" + Me.MyComboBox1.Size = New System.Drawing.Size(98, 21) + Me.MyComboBox1.TabIndex = 7 + ' + 'cboFiliale + ' + Me.cboFiliale._allowedValuesFreiText = Nothing + Me.cboFiliale._allowFreiText = False + Me.cboFiliale._value = "" + Me.cboFiliale.DropDownWidth = 300 + Me.cboFiliale.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cboFiliale.FormattingEnabled = True + Me.cboFiliale.Location = New System.Drawing.Point(389, 13) + Me.cboFiliale.MaxLength = 4 + Me.cboFiliale.Name = "cboFiliale" + Me.cboFiliale.Size = New System.Drawing.Size(70, 24) + Me.cboFiliale.TabIndex = 3 + ' + 'gridMyAviso + ' + Me.gridMyAviso.AKTUALISIERUNGS_INTERVALL = -1 + Me.gridMyAviso.AllowUserToAddRows = False + Me.gridMyAviso.AllowUserToDeleteRows = False + Me.gridMyAviso.AllowUserToOrderColumns = True + Me.gridMyAviso.AllowUserToResizeRows = False + DataGridViewCellStyle24.BackColor = System.Drawing.Color.Azure + Me.gridMyAviso.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle24 + Me.gridMyAviso.BackgroundColor = System.Drawing.Color.White + DataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle25.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + DataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridMyAviso.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle25 + Me.gridMyAviso.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + DataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window + DataGridViewCellStyle26.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.ControlText + DataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.[False] + Me.gridMyAviso.DefaultCellStyle = DataGridViewCellStyle26 + 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 + DataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft + DataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control + DataGridViewCellStyle27.Font = New System.Drawing.Font("Microsoft Sans Serif", 5.5!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + DataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText + DataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight + DataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText + DataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.[True] + Me.gridMyAviso.RowHeadersDefaultCellStyle = DataGridViewCellStyle27 + Me.gridMyAviso.RowHeadersVisible = False + Me.gridMyAviso.RowHeadersWidth = 62 + Me.gridMyAviso.Size = New System.Drawing.Size(488, 279) + Me.gridMyAviso.TabIndex = 0 + ' + 'cboMy_Grenzstelle + ' + Me.cboMy_Grenzstelle._allowedValuesFreiText = Nothing + Me.cboMy_Grenzstelle._allowFreiText = False + Me.cboMy_Grenzstelle._value = "" + Me.cboMy_Grenzstelle.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cboMy_Grenzstelle.BackColor = System.Drawing.Color.WhiteSmoke + Me.cboMy_Grenzstelle.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboMy_Grenzstelle.DropDownWidth = 120 + 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.Name = "cboMy_Grenzstelle" + Me.cboMy_Grenzstelle.Size = New System.Drawing.Size(64, 21) + Me.cboMy_Grenzstelle.TabIndex = 26 + ' + 'cboMyAvisoAnzeige + ' + Me.cboMyAvisoAnzeige._allowedValuesFreiText = Nothing + Me.cboMyAvisoAnzeige._allowFreiText = False + Me.cboMyAvisoAnzeige._value = "" + Me.cboMyAvisoAnzeige.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.cboMyAvisoAnzeige.BackColor = System.Drawing.Color.WhiteSmoke + Me.cboMyAvisoAnzeige.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + 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.Name = "cboMyAvisoAnzeige" + Me.cboMyAvisoAnzeige.Size = New System.Drawing.Size(127, 21) + Me.cboMyAvisoAnzeige.TabIndex = 21 + ' + 'btnMitarbeiterKonto + ' + Me.btnMitarbeiterKonto.allowBorder = False + Me.btnMitarbeiterKonto.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnMitarbeiterKonto.BackColor = System.Drawing.Color.White + Me.btnMitarbeiterKonto.FlatAppearance.BorderSize = 0 + Me.btnMitarbeiterKonto.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnMitarbeiterKonto.ForeColor = System.Drawing.Color.Black + Me.btnMitarbeiterKonto.Image = Global.AVISO.My.Resources.Resources.mitarbeiter_s + Me.btnMitarbeiterKonto.ImageAlign = System.Drawing.ContentAlignment.TopCenter + Me.btnMitarbeiterKonto.Location = New System.Drawing.Point(1109, -6) + Me.btnMitarbeiterKonto.Name = "btnMitarbeiterKonto" + Me.btnMitarbeiterKonto.Size = New System.Drawing.Size(137, 61) + Me.btnMitarbeiterKonto.TabIndex = 86 + Me.btnMitarbeiterKonto.Text = "Andreas Luxbauer" + Me.btnMitarbeiterKonto.TextAlign = System.Drawing.ContentAlignment.BottomCenter + Me.btnMitarbeiterKonto.UseVisualStyleBackColor = False + ' + 'btnZertifikate + ' + Me.btnZertifikate.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.btnZertifikate.ForeColor = System.Drawing.Color.Black + Me.btnZertifikate.Image = CType(resources.GetObject("btnZertifikate.Image"), System.Drawing.Image) + Me.btnZertifikate.ImageAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnZertifikate.Location = New System.Drawing.Point(3, 83) + Me.btnZertifikate.Name = "btnZertifikate" + Me.btnZertifikate.Size = New System.Drawing.Size(121, 25) + Me.btnZertifikate.TabIndex = 5 + Me.btnZertifikate.TabStop = False + Me.btnZertifikate.Text = "Zertifikate" + Me.btnZertifikate.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnZertifikate.UseVisualStyleBackColor = True + ' + 'UsrCntlBenachrichtigungen1 + ' + Me.UsrCntlBenachrichtigungen1.Dock = System.Windows.Forms.DockStyle.Fill + 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.TabIndex = 0 + ' + 'cntVerag + ' + Me.cntVerag.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ZertifikateToolStripMenuItem, Me.HomepageToolStripMenuItem}) + Me.cntVerag.Name = "cntVerag" + Me.cntVerag.Size = New System.Drawing.Size(134, 48) + ' + 'ZertifikateToolStripMenuItem + ' + Me.ZertifikateToolStripMenuItem.Name = "ZertifikateToolStripMenuItem" + Me.ZertifikateToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ZertifikateToolStripMenuItem.Text = "Zertifikate" + ' + 'HomepageToolStripMenuItem + ' + Me.HomepageToolStripMenuItem.Name = "HomepageToolStripMenuItem" + Me.HomepageToolStripMenuItem.Size = New System.Drawing.Size(133, 22) + Me.HomepageToolStripMenuItem.Text = "Homepage" ' 'frmHauptfenster ' @@ -3695,7 +3734,6 @@ Partial Class frmHauptfenster CType(Me.SplitContainer3, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer3.ResumeLayout(False) Me.pnl.ResumeLayout(False) - CType(Me.gridMyAviso, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel6.ResumeLayout(False) Me.Panel6.PerformLayout() Me.tbcntrAviso.ResumeLayout(False) @@ -3710,7 +3748,6 @@ Partial Class frmHauptfenster Me.splitMain.Panel2.ResumeLayout(False) CType(Me.splitMain, System.ComponentModel.ISupportInitialize).EndInit() Me.splitMain.ResumeLayout(False) - CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() Me.pnlTime.ResumeLayout(False) @@ -3723,6 +3760,9 @@ Partial Class frmHauptfenster Me.Panel3.ResumeLayout(False) Me.Panel3.PerformLayout() Me.Panel4.ResumeLayout(False) + CType(Me.gridAviso, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.gridMyAviso, System.ComponentModel.ISupportInitialize).EndInit() + Me.cntVerag.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -4076,4 +4116,8 @@ Partial Class frmHauptfenster Friend WithEvents lblAbsender As Label Friend WithEvents txtAbsender As TextBox Friend WithEvents FenstergrößeVariabelToolStripMenuItem As ToolStripMenuItem + Friend WithEvents btnZertifikate As Button + Friend WithEvents cntVerag As ContextMenuStrip + Friend WithEvents ZertifikateToolStripMenuItem As ToolStripMenuItem + Friend WithEvents HomepageToolStripMenuItem As ToolStripMenuItem End Class diff --git a/Aviso/frmHauptfenster.resx b/Aviso/frmHauptfenster.resx index 1b1c7ab..0f96f3e 100644 --- a/Aviso/frmHauptfenster.resx +++ b/Aviso/frmHauptfenster.resx @@ -171,6 +171,21 @@ 598, 17 + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAhBJREFUSEvt + 1k1LVFEcgPE7hLYoKQva+Q2ibbve1pL0AYzIXCVIpbVJaqHSJxCswLULKXeBIFRgqwJDJTNQsY0YtdLE + 0Hye8dzLdTgz4zQt58CPOXPO/2XUO56TMH7iNC5jCZv4gRFcwCkcRwHlhnvGGGuOudaw1ldcgXuuJXtY + gIHncR/r+IPdQqHwl9eX8AO14hjS4dy1S3gRYndhrjUewJrWnsNeYlAI/I1JtOMp3mIN20gbD+EiTgTO + h3KNjP2Od7CGtV5jK+uTTkKSCZ/wCNfxGG/gp02bzqA3+BDWbGaMsQPowEN8xPahHvk32eJB8jju4AbG + 8AUb+FXCNfeMMdYcc9ejtWOLKZJW8AQW6sQzjOJ54Nw194wxdjlWK1WxoShg02604Cpu4lbg/BpOwp9s + JVYjr2pDUWgYZzGIabwPnPsgncFgLLdUrQ0nsJNb38ErNBpmGg2LKNZo2GiYIS5Zi23kEfNfGhLj+Zrc + xVIsIMV+3Q3Z/4YeJE3wP/18LFDs1dWQPa8wnjjNKA6Pl9uYLZPwzw1Z/4wu2OPQ8DLkQTqFjZKkmhvy + 3puAtTwzrR0dXuW8gXnGLeaSa2rIfBHWsJY1Kw5/z224h+LDxOuRG/Lqw+FV0xrZ36za8GJ7Dn3winGk + hlhFP8ytdHEuO7yRe93zq1OtoTFeL82pa3iF96vjKNfQYYyxFUaS7APsTyl69HfqsQAAAABJRU5ErkJg + gg== + + 1217, 11 @@ -263,7 +278,7 @@ 1557, 17 - 17, 56 + 1773, 17 diff --git a/Aviso/frmHauptfenster.vb b/Aviso/frmHauptfenster.vb index 81dd462..28a693a 100644 --- a/Aviso/frmHauptfenster.vb +++ b/Aviso/frmHauptfenster.vb @@ -4531,6 +4531,10 @@ Public Class frmHauptfenster End If End Sub + + Private Sub btnZertifikate_Click(sender As Object, e As EventArgs) Handles btnZertifikate.Click + Process.Start("https://verag.ag/de/about-us") + End Sub End Class Public Class AvisoStatusFunctions @@ -4886,6 +4890,7 @@ Public Class AvisoStatusFunctions End Sub + Shared Sub Email_senden(art, AVISO, EMails, EMails_CC, EMails_BCC, KundenNr, Optional ForceMail = "") 'art = 1 : Ankunft 'art = 2 : Freigabe diff --git a/Aviso/frmSendungsdetailsNEU.vb b/Aviso/frmSendungsdetailsNEU.vb index ee71e69..a8fcfd3 100644 --- a/Aviso/frmSendungsdetailsNEU.vb +++ b/Aviso/frmSendungsdetailsNEU.vb @@ -6344,7 +6344,11 @@ Public Class frmSendungsdetailsNEU Dim SND As VERAG_PROG_ALLGEMEIN.cSendungen = SENDUNG_LIST(CURRENT_INDEX) Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(AVISO, SND, Now.ToString("yy"), dgvATEZNCTS) frmAttilaATEZNCTS.Show(Me) - initdgvATEZ() + + AddHandler frmAttilaATEZNCTS.FormClosing, Function() + initdgvATEZ() + Me.BringToFront() + End Function End If Catch ex As Exception @@ -6434,7 +6438,10 @@ Public Class frmSendungsdetailsNEU Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value, AVISO, SND, Now.ToString("yy")) frmAttilaATEZNCTS.Show(Me) Me.Refresh() - initdgvATEZ() + AddHandler frmAttilaATEZNCTS.FormClosing, Function() + initdgvATEZ() + Me.BringToFront() + End Function End If @@ -6454,7 +6461,7 @@ Public Class frmSendungsdetailsNEU MsgBox("Bereits gesendete Request können nicht gelöscht werden!") Exit Sub End If - If vbYes = MsgBox("Möchten Sie diesen Request wirklich löschen?", vbYesNoCancel) Then + If vbYes = MsgBox("Möchten Sie den Request " & dgvATEZNCTS.SelectedRows(0).Cells("BezugsNr").Value & " wirklich löschen?", vbYesNoCancel) Then Dim atez As New cATEZ_NCTS_DATA(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value) atez.delete() initdgvATEZ() diff --git a/Aviso/usrcntlAktDetailsATILLANeu.vb b/Aviso/usrcntlAktDetailsATILLANeu.vb index 836344f..d84c1c0 100644 --- a/Aviso/usrcntlAktDetailsATILLANeu.vb +++ b/Aviso/usrcntlAktDetailsATILLANeu.vb @@ -1655,8 +1655,14 @@ Public Class usrcntlAktDetailsATILLANeu frmAttilaATEZNCTS.Show(Me) Me.Refresh() + AddHandler frmAttilaATEZNCTS.FormClosing, Function() + initdgvATEZ() + Me.BringToFront() + End Function End If + + Catch ex As Exception MsgBox(ex.Message & ex.StackTrace) End Try @@ -1678,7 +1684,12 @@ Public Class usrcntlAktDetailsATILLANeu Dim frmAttilaATEZNCTS = New frmATEZ_NCTS(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value, AVISO, SND, Now.ToString("yy")) frmAttilaATEZNCTS.Show(Me) Me.Refresh() - initdgvATEZ() + + AddHandler frmAttilaATEZNCTS.FormClosing, Function() + initdgvATEZ() + Me.BringToFront() + End Function + End If @@ -1696,7 +1707,7 @@ Public Class usrcntlAktDetailsATILLANeu MsgBox("Bereits gesendete Request können nicht gelöscht werden!") Exit Sub End If - If vbYes = MsgBox("Möchten Sie diesen Request wirklich löschen?", vbYesNoCancel) Then + If vbYes = MsgBox("Möchten Sie den Request " & dgvATEZNCTS.SelectedRows(0).Cells("BezugsNr").Value & " wirklich löschen?", vbYesNoCancel) Then Dim atez As New cATEZ_NCTS_DATA(dgvATEZNCTS.SelectedRows(0).Cells("Id").Value) atez.delete() initdgvATEZ() diff --git a/Gemeinsames/Gemeinsames.vbproj b/Gemeinsames/Gemeinsames.vbproj index 4158eac..43b8767 100644 --- a/Gemeinsames/Gemeinsames.vbproj +++ b/Gemeinsames/Gemeinsames.vbproj @@ -82,11 +82,17 @@ x64 - bin\x64\Debug\ + bin\Debug\ x64 - bin\x64\Release\ + bin\Release\ + + + false + + + Gemeinsames_TemporaryKey.pfx @@ -123,10 +129,6 @@ - - False - ..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll - @@ -307,6 +309,10 @@ {50e8e49b-4fd9-4dd4-b159-bdc2b7d0e94f} DAKOSY_Worker_lib + + {a3b497bd-842c-4a2b-b398-ed1976849df1} + VERAG_PROG_ALLGEMEIN +
MitarbeiterMontagDienstagMittwochDonnerstagFreitagGebäudeAnmerkung
MitarbeiterMontagDienstagMittwochDonnerstagFreitagGebäudeAnmerkungFirma
" & row("Freitag") & "" & row("Gebaeude") & "" & row("Anmerkung") & "" & row("Firma") & "
" & row.Cells("eb_freitag").Value & "" & row.Cells("eb_gebaeude").Value & "" & row.Cells("eb_anmerkung").Value & "" & row.Cells("eb_firma").Value & "