From 46c14b65001f6e9e80db7b79a98b92c1923d9aa4 Mon Sep 17 00:00:00 2001 From: Andreas Luxbauer Date: Fri, 8 Jul 2022 08:12:07 +0200 Subject: [PATCH] neu --- DAKOSY_Worker/cZOLL_IMPORT.vb | 7 + DienstplanTV/App.config | 40 + MailSender/MAILSender.vb | 38 +- TELOTEK_Worker_lib/cTC_Functions.vb | 2 +- UID/ADMIN.vbproj | 6 + UID/App.config | 80 ++ UID/Dienstplan/frmDienstplanVariabel.vb | 2 +- UID/Dienstplan/usrCntlDienstplan.vb | 5 +- UID/Dienstplan/usrcntlDienstplanStunden.vb | 2 +- UID/My Project/AssemblyInfo.vb | 4 +- UID/My Project/Resources.Designer.vb | 29 +- UID/My Project/Resources.resx | 7 +- UID/My Project/licenses.licx | 2 + UID/cProgramFunctions.vb | 32 +- UID/cSqlDb.vb | 17 +- UID/packages.config | 1 + UID/usrctlProcedures.Designer.vb | 132 ++- UID/usrctlProcedures.resx | 6 + UID/usrctlProcedures.vb | 186 +++- .../My Project/Resources.Designer.vb | 11 +- VERAGMonitoring/My Project/Resources.resx | 5 +- VERAGMonitoring/VERAGMonitoring.vbproj | 2 +- VERAGMonitoring/cClasses.vb | 6 + VERAGMonitoring/cSqlDb.vb | 3 +- VERAGMonitoring/frmMain.Designer.vb | 310 ++++-- VERAGMonitoring/frmMain.vb | 324 +++++- VERAGMonitoring/frmShowData.Designer.vb | 93 +- VERAGMonitoring/frmShowData.vb | 4 +- .../Resources/Muster_IDS_PLATTSPR.xls | Bin 0 -> 30208 bytes initATLASAufschubkonten/RoutineManager.vbproj | 3 + initATLASAufschubkonten/cBuergschaften.vb | 1 + .../frmStartOptions.Designer.vb | 159 ++- initATLASAufschubkonten/frmStartOptions.resx | 192 ++-- initATLASAufschubkonten/frmStartOptions.vb | 925 +++++++++++++----- 34 files changed, 1958 insertions(+), 678 deletions(-) create mode 100644 initATLASAufschubkonten/Resources/Muster_IDS_PLATTSPR.xls diff --git a/DAKOSY_Worker/cZOLL_IMPORT.vb b/DAKOSY_Worker/cZOLL_IMPORT.vb index aba1a40..2b54f4b 100644 --- a/DAKOSY_Worker/cZOLL_IMPORT.vb +++ b/DAKOSY_Worker/cZOLL_IMPORT.vb @@ -1641,6 +1641,13 @@ Public Class cZOLL_IMPORT End If End If + ' Qualitäts-CRN --> Tabelle zsAnmGdsItemDocCerts lesen. + Dim DTzsAnmGdsQ As DataTable = KDSQL.loadDgvBySql("Select distinct(DRef) DRef FROM [zsAnmGdsItemDocCerts] WHERE (LizenzNr = '" & DR_zsAnmRefs.Item("LizenzNr") & "') And (OperatorID = " & DR_zsAnmRefs.Item("OperatorID") & ") And (VorgangID = '" & DR_zsAnmRefs.Item("VorgangID") & "') And (AnmID = " & DR_zsAnmRefs.Item("AnmID") & " AND DocCd IN ('N002' ,'7246') )", "EZOLL") + If DTzsAnmGdsQ IsNot Nothing AndAlso DTzsAnmGdsQ.Rows().Count > 0 Then + If Not IsNull(DTzsAnmGdsQ.Rows(0).Item("DRef")) Then SPEDITIONSBUCH.QKN = DTzsAnmGdsQ.Rows(0).Item("DRef") + End If + + 'Personal Abfertigung: Try If Not IsNull(DR_zsAnmRefs.Item("GeaendertVon")) Then diff --git a/DienstplanTV/App.config b/DienstplanTV/App.config index cf553b3..15dab8a 100644 --- a/DienstplanTV/App.config +++ b/DienstplanTV/App.config @@ -21,6 +21,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MailSender/MAILSender.vb b/MailSender/MAILSender.vb index 23ec639..152d001 100644 --- a/MailSender/MAILSender.vb +++ b/MailSender/MAILSender.vb @@ -46,7 +46,7 @@ Module Mail 'Dim _erg = VERAG_PROG_ALLGEMEIN.cNCTS_Helper.getXLS_FremdBRG("UNISPED", "TOBB - 15TR0004000020917 / 12TR0004000004665 / 17TR0004000032349 / 17TR0004000029518 ", " '12TR0004000004665','15TR0004000020917','17TR0004000032349','17TR0004000029518 '", CDate("01.08.2021 00:00:00"), CDate("12.08.2021 23:59:59"), True) 'Dim _list As New List(Of String) : _list.Add(_erg) '' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TOBB " & "UNISPED", "*Automatic generated e-mail*",,,, "", "al@verag.ag", _list) - 'VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;pinar.dogan@tobbund.com.tr;kerem.gozutok@tobbund.com.tr", "TOBB " & "UNISPED", "*Automatic generated e-mail*",,,, "Katharina.Haas@unisped.at;Sabine.Muehlboeck@unisped.at;Ernst.Stolzlechner@unisped.at", "al@verag.ag", _list) + 'VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;kerem.gozutok@tobbund.com.tr", "TOBB " & "UNISPED", "*Automatic generated e-mail*",,,, "Katharina.Haas@unisped.at;Sabine.Muehlboeck@unisped.at;Ernst.Stolzlechner@unisped.at", "al@verag.ag", _list) 'Exit Sub @@ -236,27 +236,27 @@ Module Mail End Select - End If - ' Else - ' System.Console.WriteLine("OPTIONS-Datei nicht gefunden! " & options) - ' End If + End If + ' Else + ' System.Console.WriteLine("OPTIONS-Datei nicht gefunden! " & options) + ' End If - Threading.Thread.Sleep(1000) - ' System.Console.WriteLine("Programm beendet in 5") - ' Threading.Thread.Sleep(1000) - ' System.Console.WriteLine("Programm beendet in 4") - ' Threading.Thread.Sleep(1000) - System.Console.WriteLine("Programm beendet in 3") - Threading.Thread.Sleep(1000) - System.Console.WriteLine("Programm beendet in 2") - Threading.Thread.Sleep(1000) - System.Console.WriteLine("Programm beendet in 1") + Threading.Thread.Sleep(1000) + ' System.Console.WriteLine("Programm beendet in 5") + ' Threading.Thread.Sleep(1000) + ' System.Console.WriteLine("Programm beendet in 4") + ' Threading.Thread.Sleep(1000) + System.Console.WriteLine("Programm beendet in 3") + Threading.Thread.Sleep(1000) + System.Console.WriteLine("Programm beendet in 2") + Threading.Thread.Sleep(1000) + System.Console.WriteLine("Programm beendet in 1") Threading.Thread.Sleep(1000) Exit Sub Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name) - Exit Sub + Exit Sub End Try End Sub @@ -275,9 +275,9 @@ Module Mail Dim bool_sent = False Select Case FirmaTmp - Case "VERAG/ATILLA" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;pinar.dogan@tobbund.com.tr;kerem.gozutok@tobbund.com.tr;amine.akan@tobbund.com.tr", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "atilla@verag.ag", "al@verag.ag", _list) - Case "IMEX" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;pinar.dogan@tobbund.com.tr;kerem.gozutok@tobbund.com.tr;amine.akan@tobbund.com.tr", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "info@imex-group.at;Mario.Hoefer@imex-group.at", "al@verag.ag", _list) - Case "UNISPED" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;pinar.dogan@tobbund.com.tr;kerem.gozutok@tobbund.com.tr;amine.akan@tobbund.com.tr", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "Katharina.Haas@unisped.at;Sabine.Muehlboeck@unisped.at;Ernst.Stolzlechner@unisped.at", "al@verag.ag", _list) + Case "VERAG/ATILLA" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;kerem.gozutok@tobbund.com.tr;amine.akan@tobbund.com.tr", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "atilla@verag.ag", "al@verag.ag", _list) + Case "IMEX" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;kerem.gozutok@tobbund.com.tr;amine.akan@tobbund.com.tr", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "info@imex-group.at;Mario.Hoefer@imex-group.at", "al@verag.ag", _list) + Case "UNISPED" : bool_sent = VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("eysan.sans@tobbund.com.tr;kerem.gozutok@tobbund.com.tr;amine.akan@tobbund.com.tr", "TOBB " & FirmaTmp & addbetreff, "*Automatic generated e-mail*",,,, "Katharina.Haas@unisped.at;Sabine.Muehlboeck@unisped.at;Ernst.Stolzlechner@unisped.at", "al@verag.ag", _list) End Select If bool_sent Then diff --git a/TELOTEK_Worker_lib/cTC_Functions.vb b/TELOTEK_Worker_lib/cTC_Functions.vb index ae874a5..62ba82a 100644 --- a/TELOTEK_Worker_lib/cTC_Functions.vb +++ b/TELOTEK_Worker_lib/cTC_Functions.vb @@ -17,7 +17,7 @@ Public Class cTC_Functions Dim destFilenameTMP = UPLOAD_PFAD + "." & If(IO.File.Exists(UPLOAD_PFAD & "." & fi.Name), Now.ToString("yyMMdd_HHmmss.fff_"), "") & fi.Name - + MsgBox(destFilenameTMP) 'Datei hochladen IO.File.Copy(file, destFilenameTMP) ' If IO.File.Exists(destFilenameTMP) Then IO.File.Delete(F) 'Datei nach erfolgreichem Herunterladen vom Server löschen diff --git a/UID/ADMIN.vbproj b/UID/ADMIN.vbproj index d0df0d7..7d502b9 100644 --- a/UID/ADMIN.vbproj +++ b/UID/ADMIN.vbproj @@ -80,6 +80,9 @@ + + ..\packages\ATAPI.2018.3.9\lib\net46\atapi.dll + False C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll @@ -170,6 +173,9 @@ ..\packages\Hardcodet.NotifyIcon.Wpf.1.0.5\lib\net40-client\Hardcodet.Wpf.TaskbarNotification.dll True + + ..\..\..\dll\TAPI\ITapi3.dll + ..\..\..\dll\itextsharp.dll diff --git a/UID/App.config b/UID/App.config index fb58a85..9c63e20 100644 --- a/UID/App.config +++ b/UID/App.config @@ -56,6 +56,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/UID/Dienstplan/frmDienstplanVariabel.vb b/UID/Dienstplan/frmDienstplanVariabel.vb index 777d41f..4e6b612 100644 --- a/UID/Dienstplan/frmDienstplanVariabel.vb +++ b/UID/Dienstplan/frmDienstplanVariabel.vb @@ -433,7 +433,7 @@ Public Class frmDienstplanVariabel If usrCntlZeitenAendern1.txtPause.Text.Contains(",") And Not usrCntlZeitenAendern1.txtPause.Text.Contains(",5") Then Throw New Exception If Not IsNumeric(usrCntlZeitenAendern1.txtPause.Text) Then Throw New Exception - If usrCntlZeitenAendern1.txtPause.Text > 3 Or usrCntlZeitenAendern1.txtPause.Text < 0 Then MsgBox("Die Pause darf nicht größer als 3 Stunden sein!") : Throw New Exception + If usrCntlZeitenAendern1.txtPause.Text > 3 Or usrCntlZeitenAendern1.txtPause.Text < 0 Then MsgBox("Die Pause darf nicht größer als 3 Stunden und nicht kleiner als 0 sein!") : Throw New Exception If usrCntlZeitenAendern1.cbxChangeForWo.Checked Then 'für ganze Woche diff --git a/UID/Dienstplan/usrCntlDienstplan.vb b/UID/Dienstplan/usrCntlDienstplan.vb index 466c9c0..27f402f 100644 --- a/UID/Dienstplan/usrCntlDienstplan.vb +++ b/UID/Dienstplan/usrCntlDienstplan.vb @@ -369,7 +369,7 @@ Public Class usrCntlDienstplan AddHandler rpt.Detail.Format, Sub() - If Not IsDBNull(rpt.Fields.Item("dstetr_datum").Value) Then + If Not IsDBNull(rpt.Fields.Item("dstetr_datum").Value) AndAlso rpt.Fields.Item("dstetr_datum").Value <> "" AndAlso IsDate(rpt.Fields.Item("dstetr_datum").Value) Then 'MsgBox(rpt.Fields.Item("dstetr_datum").Value) datumKW = CDate(rpt.Fields.Item("dstetr_datum").Value).ToShortDateString End If @@ -487,6 +487,7 @@ Public Class usrCntlDienstplan ' rpt.txtSumWoStunden.Text = CDbl(sumUeStd).ToString("N2") 'Zuerst den montag der aktueellen Woche lt. Datum ermitteln: + MsgBox(cPF.DateToWeek(datumKW)) Dim datumMO As Date = cPF.GetWeekStartDate(cPF.DateToWeek(datumKW).Substring(4, 2), cPF.DateToWeek(datumKW).Substring(0, 4)) 'Aktuelle Woche und Jahr anhand des Montages ermitteln: @@ -499,7 +500,7 @@ Public Class usrCntlDienstplan ' MsgBox(sollStd) If groupKW Then - Dim sollStd As Double = cPF.getWochenstunden(STD_LIST, MA_DST.dstma_wochenStunden, datumMO, SCHICHT, MA_DST.dstma_mitId, MA_DST.dstma_muster, MA_DST.dstma_WEStdRegelAZ, MA_DST.dstma_arbvh, niederlassung, MA_DST.dstma_TzFeiertageStd) + Dim sollStd As Double = cPF.getWochenstunden(STD_LIST, MA_DST.dstma_wochenStunden, datumMO, SCHICHT, MA_DST.dstma_mitId, MA_DST.dstma_muster, MA_DST.dstma_WEStdRegelAZ, MA_DST.dstma_arbvh, niederlassung, MA_DST.dstma_TzFeiertageStd, MA_DST.dstma_4wo) Dim tatStd As Double = SQLDienst.getDstStunden(MA_DST.dstma_id, datumMO, datumMO.AddDays(6), niederlassung) rpt.txtSumWoStunden.Text = CDbl(tatStd).ToString("N2") diff --git a/UID/Dienstplan/usrcntlDienstplanStunden.vb b/UID/Dienstplan/usrcntlDienstplanStunden.vb index 2b9727f..a116ff1 100644 --- a/UID/Dienstplan/usrcntlDienstplanStunden.vb +++ b/UID/Dienstplan/usrcntlDienstplanStunden.vb @@ -94,7 +94,7 @@ Public Class usrcntlDienstplanStunden 'MsgBox(ma.dstma_wochenStunden) 'hier wird berechnet, wie viele Stunden tatsächlich zu arbeiten sind (abzgl. Feiertage) - Wochenstunden = cPF.getWochenstunden(STD_LIST, Wochenstunden, datum, SCHICHT, r.Cells("dstma_id").Value, ma.dstma_muster, ma.dstma_WEStdRegelAZ, ma.dstma_arbvh, niederlassung, ma.dstma_TzFeiertageStd) + Wochenstunden = cPF.getWochenstunden(STD_LIST, Wochenstunden, datum, SCHICHT, r.Cells("dstma_id").Value, ma.dstma_muster, ma.dstma_WEStdRegelAZ, ma.dstma_arbvh, niederlassung, ma.dstma_TzFeiertageStd, ma.dstma_4wo) 'Hier wird berechnet wie viele Std tastächlich gearbeitet wurden: Dim tatStd As Double = SQLDienst.getDstStunden(r.Cells("dstma_id").Value, datum_montag, datum_montag.AddDays(6), niederlassung) diff --git a/UID/My Project/AssemblyInfo.vb b/UID/My Project/AssemblyInfo.vb index 080c9b1..7a51c0b 100644 --- a/UID/My Project/AssemblyInfo.vb +++ b/UID/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/UID/My Project/Resources.Designer.vb b/UID/My Project/Resources.Designer.vb index 72695a2..330bda8 100644 --- a/UID/My Project/Resources.Designer.vb +++ b/UID/My Project/Resources.Designer.vb @@ -110,6 +110,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. + ''' + Friend ReadOnly Property asda2sdas1das() As String + Get + Return ResourceManager.GetString("asda2sdas1das", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Byte[]. ''' @@ -140,6 +149,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. + ''' + Friend ReadOnly Property bbvn6() As String + Get + Return ResourceManager.GetString("bbvn6", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Byte[]. ''' @@ -316,15 +334,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. - ''' - Friend ReadOnly Property fähggh3j2gh6j2gh62jgh6j2hg6jghjghj() As String - Get - Return ResourceManager.GetString("fähggh3j2gh6j2gh62jgh6j2hg6jghjghj", resourceCulture) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -655,7 +664,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 2.0.4 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 2.0.6 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/UID/My Project/Resources.resx b/UID/My Project/Resources.resx index 3c2554d..a7c13ee 100644 --- a/UID/My Project/Resources.resx +++ b/UID/My Project/Resources.resx @@ -188,7 +188,7 @@ Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=AppUser;Password=yp/THDd?xM+pZ$; - 2.0.4 + 2.0.6 ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -301,7 +301,10 @@ ..\Resources\personGray_w.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + + + + \ No newline at end of file diff --git a/UID/My Project/licenses.licx b/UID/My Project/licenses.licx index e69de29..5b6d191 100644 --- a/UID/My Project/licenses.licx +++ b/UID/My Project/licenses.licx @@ -0,0 +1,2 @@ +GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff +GrapeCity.ActiveReports.Viewer.Win.Viewer, GrapeCity.ActiveReports.Viewer.Win, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff diff --git a/UID/cProgramFunctions.vb b/UID/cProgramFunctions.vb index 864bc17..b972f1a 100644 --- a/UID/cProgramFunctions.vb +++ b/UID/cProgramFunctions.vb @@ -910,7 +910,7 @@ Public Class cProgramFunctions Dim SQLDienst As New cDienstplan - Public Function getWochenstunden(STD_LIST As List(Of cDienstMitarbAbweichendeWochenstunden), Wochenstunden As Double, datum As Date, SCHICHT As String, dstma_id As Integer, dstma_muster As Boolean, dstma_WEStdRegelAZ As Boolean, dstma_arbvh As String, niederlassung As String, StdFeiertag As Object) As Double + Public Function getWochenstunden(STD_LIST As List(Of cDienstMitarbAbweichendeWochenstunden), Wochenstunden As Double, datum As Date, SCHICHT As String, dstma_id As Integer, dstma_muster As Boolean, dstma_WEStdRegelAZ As Boolean, dstma_arbvh As String, niederlassung As String, StdFeiertag As Object, schicht4wo As Boolean) As Double getWochenstunden = cDienstMitarbAbweichendeWochenstunden.GET_STD_LIST(STD_LIST, dstma_id, datum, Wochenstunden, If(StdFeiertag, -1)) Dim UrlStd As Double = 8 @@ -924,26 +924,31 @@ Public Class cProgramFunctions If dstma_muster Then 'Wenn Muster, dann muss Feiertag bei VZ und TZ berüchsichtigt werden.... If (woTag <> "SA" And woTag <> "SO") Or dstma_WEStdRegelAZ Then ' ... aber nur wenn Wochendende teil der Regel-Arbeitszeit ist. - Dim tz As cDienstTeilzeit = SQLDienst.getDienstTeilzeitBySchicht(dstma_id, SCHICHT, woTag) + Dim tz As cDienstTeilzeit = SQLDienst.getDienstTeilzeitBySchicht(dstma_id, SCHICHT, woTag, schicht4wo) If tz IsNot Nothing Then ' EVtl gibt es den WoTag Nicht 'Wochenstunden -= getDiff(tz.dsttz_von, tz.dsttz_bis, niederlassung, (FT.isFeiertag(datum) Or woTag = "SO")) If datum.ToString("dd.MM.") = "31.12." Or datum.ToString("dd.MM.") = "24.12." Then 'Weihnachten und Silvester ist ist nur 1/2 Tag!!! getWochenstunden -= UrlStd / 2 Else + + If dstma_arbvh = "VZ" Then getWochenstunden -= UrlStd 'bei vollzeit mit Muster werden 8 Std abgezogen Else - If getDiff(tz.dsttz_von, tz.dsttz_bis, niederlassung, False) > 0 Then 'Wenn an deisem Tag Stunden angefallen wären (lt. Muster) - getWochenstunden -= UrlStd - ' getWochenstunden -= getDiff(tz.dsttz_von, tz.dsttz_bis, niederlassung, False) - ' If IsNumeric(tz.dsttz_pause) Then getWochenstunden += tz.dsttz_pause + If StdFeiertag IsNot Nothing Then + getWochenstunden -= UrlStd ' wurde oben schon angepasst. + Else + + 'gibt es keine deinierten Std.für einen Feiertag, werden die Stunden nach Mustereinteilung berechnet: + If getDiff(tz.dsttz_von, tz.dsttz_bis, niederlassung, False) > 0 Then 'Wenn an deisem Tag Stunden angefallen wären (lt. Muster) + Dim getWochenstundenTAG = getDiff(tz.dsttz_von, tz.dsttz_bis, niederlassung, False) + If IsNumeric(tz.dsttz_pause) Then getWochenstundenTAG += tz.dsttz_pause + getWochenstunden -= getWochenstundenTAG + End If End If - End If - End If - End If End If Else @@ -1036,16 +1041,17 @@ Public Class cProgramFunctions ' Prüfen, ob Datum zur ersten Woche des Folgejahres gehört If dDate >= dNextYear Then - ' Rückgabe: KW 1 des Folgejahres - Return dDate.Year + 1 & "01" + ' Rückgabe: KW 1 des Folgejahres + Return (dDate.Year + 1) & "01" ElseIf dDate < dThisYear Then ' Falls das Datum noch zu einer KW aus dem letzten Jahr zählt Return dDate.Year - 1 & DatePart(DateInterval.WeekOfYear, New Date(dDate.Year - 1, 12, 28), FirstDayOfWeek.Monday, FirstWeekOfYear.FirstFourDays) Else + ' KW = Differenz zum ersten Tag der ersten Woche - Return dDate.Year & Format$(dDate.Subtract(dThisYear).Days \ 7 + 1, "00") + Return dDate.Year.ToString & Format$(dDate.Subtract(dThisYear).Days \ 7 + 1, "00").ToString End If End Function @@ -1079,7 +1085,7 @@ Public Class cProgramFunctions If IsNumeric(ma.dstma_wochenStunden) Then Wochenstunden = ma.dstma_wochenStunden ' MsgBox(Wochenstunden) - Wochenstunden = cPF.getWochenstunden(STD_LIST, Wochenstunden, datum, SCHICHT, r("dstma_id"), ma.dstma_muster, ma.dstma_WEStdRegelAZ, ma.dstma_arbvh, niederlassung, ma.dstma_TzFeiertageStd) + Wochenstunden = cPF.getWochenstunden(STD_LIST, Wochenstunden, datum, SCHICHT, r("dstma_id"), ma.dstma_muster, ma.dstma_WEStdRegelAZ, ma.dstma_arbvh, niederlassung, ma.dstma_TzFeiertageStd, ma.dstma_4wo) Dim tatStd As Double = SQLDienst.getDstStunden(r("dstma_id"), datum_montag, datum_montag.AddDays(6), niederlassung) ' : ANDERES ERG"""""!!!!!!!!!!!!!!!!!!!! diff --git a/UID/cSqlDb.vb b/UID/cSqlDb.vb index f50d133..4576ceb 100644 --- a/UID/cSqlDb.vb +++ b/UID/cSqlDb.vb @@ -2888,12 +2888,21 @@ Public Class cDienstplan Return Nothing End Function - Public Function getDienstTeilzeitBySchicht(id, schicht, woTag) As cDienstTeilzeit + Public Function getDienstTeilzeitBySchicht(id, schicht, woTag, schicht4wo) As cDienstTeilzeit Try + If schicht4wo Then + + Else '2Wochen-Wechsel + If schicht.ToString.StartsWith("BLAU") Then schicht = "BLAU%" + If schicht.ToString.StartsWith("ROT") Then schicht = "ROT%" + End If + + Dim d As New cDienstTeilzeit Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() - Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDienstTeilzeit WHERE dsttz_maId=@dsttz_maId AND dsttz_dienstplan=@dsttz_dienstplan AND dsttz_woTag=dsttz_woTag", conn) + + Using cmd As New SqlCommand("SELECT TOP 1 * FROM tblDienstTeilzeit WHERE dsttz_maId=@dsttz_maId AND dsttz_dienstplan LIKE @dsttz_dienstplan AND dsttz_woTag=dsttz_woTag", conn) cmd.Parameters.AddWithValue("@dsttz_maId", id) cmd.Parameters.AddWithValue("@dsttz_dienstplan", schicht) cmd.Parameters.AddWithValue("@dsttz_woTag", woTag) @@ -3993,6 +4002,10 @@ Public Class cDienstplan s += cPF.getDiff(von, bis, niederlassung, (FT.isFeiertag(datum, cDienstSettings.getLand(niederlassung)) Or woTag = "SO")) If IsNumeric(dr.Item("dstetr_pause")) Then s -= CDbl(dr.Item("dstetr_pause")) + + 'Wenn Feiertag oder Sonntag, werden die Stunden (von-bis) doppelt gerechent, also müssen die Pausenstunden doppelt abgezoben werden: + If (FT.isFeiertag(datum, cDienstSettings.getLand(niederlassung)) Or woTag = "SO") Then s -= CDbl(dr.Item("dstetr_pause")) + End If Else diff --git a/UID/packages.config b/UID/packages.config index 2989245..0db4d67 100644 --- a/UID/packages.config +++ b/UID/packages.config @@ -1,5 +1,6 @@  + diff --git a/UID/usrctlProcedures.Designer.vb b/UID/usrctlProcedures.Designer.vb index 516a91f..f24a0c0 100644 --- a/UID/usrctlProcedures.Designer.vb +++ b/UID/usrctlProcedures.Designer.vb @@ -109,6 +109,9 @@ Partial Class usrctlProcedures Me.Button29 = New System.Windows.Forms.Button() Me.Button28 = New System.Windows.Forms.Button() Me.Button30 = New System.Windows.Forms.Button() + Me.Button31 = New System.Windows.Forms.Button() + Me.Button32 = New System.Windows.Forms.Button() + Me.lblStatus = New System.Windows.Forms.Label() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -121,7 +124,7 @@ Partial Class usrctlProcedures ' Me.TabControl1.Controls.Add(Me.TabPage1) Me.TabControl1.Controls.Add(Me.TabPage2) - Me.TabControl1.Location = New System.Drawing.Point(3, 313) + Me.TabControl1.Location = New System.Drawing.Point(7, 407) Me.TabControl1.Name = "TabControl1" Me.TabControl1.SelectedIndex = 0 Me.TabControl1.Size = New System.Drawing.Size(609, 187) @@ -491,7 +494,7 @@ Partial Class usrctlProcedures ' 'Button18 ' - Me.Button18.Location = New System.Drawing.Point(55, 88) + Me.Button18.Location = New System.Drawing.Point(59, 183) Me.Button18.Name = "Button18" Me.Button18.Size = New System.Drawing.Size(145, 49) Me.Button18.TabIndex = 15 @@ -500,7 +503,7 @@ Partial Class usrctlProcedures ' 'TextBox1 ' - Me.TextBox1.Location = New System.Drawing.Point(109, 62) + Me.TextBox1.Location = New System.Drawing.Point(113, 157) Me.TextBox1.Name = "TextBox1" Me.TextBox1.Size = New System.Drawing.Size(91, 20) Me.TextBox1.TabIndex = 16 @@ -509,7 +512,7 @@ Partial Class usrctlProcedures 'lblAnzahl ' Me.lblAnzahl.AutoSize = True - Me.lblAnzahl.Location = New System.Drawing.Point(61, 65) + Me.lblAnzahl.Location = New System.Drawing.Point(65, 160) Me.lblAnzahl.Name = "lblAnzahl" Me.lblAnzahl.Size = New System.Drawing.Size(42, 13) Me.lblAnzahl.TabIndex = 17 @@ -517,7 +520,7 @@ Partial Class usrctlProcedures ' 'Label3 ' - Me.Label3.Location = New System.Drawing.Point(55, 140) + Me.Label3.Location = New System.Drawing.Point(59, 235) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(145, 13) Me.Label3.TabIndex = 18 @@ -526,7 +529,7 @@ Partial Class usrctlProcedures ' 'Label4 ' - Me.Label4.Location = New System.Drawing.Point(55, 153) + Me.Label4.Location = New System.Drawing.Point(59, 248) Me.Label4.Name = "Label4" Me.Label4.Size = New System.Drawing.Size(145, 13) Me.Label4.TabIndex = 19 @@ -535,7 +538,7 @@ Partial Class usrctlProcedures ' 'Button19 ' - Me.Button19.Location = New System.Drawing.Point(219, 91) + Me.Button19.Location = New System.Drawing.Point(223, 186) Me.Button19.Name = "Button19" Me.Button19.Size = New System.Drawing.Size(145, 49) Me.Button19.TabIndex = 20 @@ -544,7 +547,7 @@ Partial Class usrctlProcedures ' 'Label5 ' - Me.Label5.Location = New System.Drawing.Point(216, 143) + Me.Label5.Location = New System.Drawing.Point(220, 238) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(145, 13) Me.Label5.TabIndex = 21 @@ -556,7 +559,7 @@ Partial Class usrctlProcedures Me.cbxTESTSYSTEMATLAS.AutoSize = True Me.cbxTESTSYSTEMATLAS.Checked = True Me.cbxTESTSYSTEMATLAS.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxTESTSYSTEMATLAS.Location = New System.Drawing.Point(219, 65) + Me.cbxTESTSYSTEMATLAS.Location = New System.Drawing.Point(223, 160) Me.cbxTESTSYSTEMATLAS.Name = "cbxTESTSYSTEMATLAS" Me.cbxTESTSYSTEMATLAS.Size = New System.Drawing.Size(98, 17) Me.cbxTESTSYSTEMATLAS.TabIndex = 22 @@ -568,7 +571,7 @@ Partial Class usrctlProcedures Me.CheckBox1.AutoSize = True Me.CheckBox1.Checked = True Me.CheckBox1.CheckState = System.Windows.Forms.CheckState.Checked - Me.CheckBox1.Location = New System.Drawing.Point(58, 39) + Me.CheckBox1.Location = New System.Drawing.Point(62, 134) Me.CheckBox1.Name = "CheckBox1" Me.CheckBox1.Size = New System.Drawing.Size(98, 17) Me.CheckBox1.TabIndex = 23 @@ -590,7 +593,7 @@ Partial Class usrctlProcedures Me.CheckBox2.AutoSize = True Me.CheckBox2.Checked = True Me.CheckBox2.CheckState = System.Windows.Forms.CheckState.Checked - Me.CheckBox2.Location = New System.Drawing.Point(389, 39) + Me.CheckBox2.Location = New System.Drawing.Point(393, 134) Me.CheckBox2.Name = "CheckBox2" Me.CheckBox2.Size = New System.Drawing.Size(98, 17) Me.CheckBox2.TabIndex = 26 @@ -599,7 +602,7 @@ Partial Class usrctlProcedures ' 'Label6 ' - Me.Label6.Location = New System.Drawing.Point(386, 140) + Me.Label6.Location = New System.Drawing.Point(390, 235) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(145, 13) Me.Label6.TabIndex = 25 @@ -608,7 +611,7 @@ Partial Class usrctlProcedures ' 'Button20 ' - Me.Button20.Location = New System.Drawing.Point(389, 88) + Me.Button20.Location = New System.Drawing.Point(393, 183) Me.Button20.Name = "Button20" Me.Button20.Size = New System.Drawing.Size(145, 49) Me.Button20.TabIndex = 24 @@ -618,7 +621,7 @@ Partial Class usrctlProcedures 'Label7 ' Me.Label7.AutoSize = True - Me.Label7.Location = New System.Drawing.Point(392, 68) + Me.Label7.Location = New System.Drawing.Point(396, 163) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(39, 13) Me.Label7.TabIndex = 28 @@ -626,7 +629,7 @@ Partial Class usrctlProcedures ' 'TextBox3 ' - Me.TextBox3.Location = New System.Drawing.Point(440, 65) + Me.TextBox3.Location = New System.Drawing.Point(444, 160) Me.TextBox3.Name = "TextBox3" Me.TextBox3.Size = New System.Drawing.Size(91, 20) Me.TextBox3.TabIndex = 27 @@ -634,7 +637,7 @@ Partial Class usrctlProcedures ' 'btn ' - Me.btn.Location = New System.Drawing.Point(165, 236) + Me.btn.Location = New System.Drawing.Point(169, 330) Me.btn.Name = "btn" Me.btn.Size = New System.Drawing.Size(140, 23) Me.btn.TabIndex = 29 @@ -643,7 +646,7 @@ Partial Class usrctlProcedures ' 'TextBox4 ' - Me.TextBox4.Location = New System.Drawing.Point(68, 238) + Me.TextBox4.Location = New System.Drawing.Point(72, 332) Me.TextBox4.Name = "TextBox4" Me.TextBox4.Size = New System.Drawing.Size(91, 20) Me.TextBox4.TabIndex = 30 @@ -652,7 +655,7 @@ Partial Class usrctlProcedures 'Label8 ' Me.Label8.AutoSize = True - Me.Label8.Location = New System.Drawing.Point(37, 241) + Me.Label8.Location = New System.Drawing.Point(41, 335) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(25, 13) Me.Label8.TabIndex = 31 @@ -660,7 +663,7 @@ Partial Class usrctlProcedures ' 'TextBox5 ' - Me.TextBox5.Location = New System.Drawing.Point(68, 264) + Me.TextBox5.Location = New System.Drawing.Point(72, 358) Me.TextBox5.Name = "TextBox5" Me.TextBox5.Size = New System.Drawing.Size(91, 20) Me.TextBox5.TabIndex = 32 @@ -668,7 +671,7 @@ Partial Class usrctlProcedures ' 'TextBox6 ' - Me.TextBox6.Location = New System.Drawing.Point(165, 265) + Me.TextBox6.Location = New System.Drawing.Point(169, 359) Me.TextBox6.Name = "TextBox6" Me.TextBox6.Size = New System.Drawing.Size(48, 20) Me.TextBox6.TabIndex = 33 @@ -676,7 +679,7 @@ Partial Class usrctlProcedures ' 'TextBox7 ' - Me.TextBox7.Location = New System.Drawing.Point(219, 265) + Me.TextBox7.Location = New System.Drawing.Point(223, 359) Me.TextBox7.Name = "TextBox7" Me.TextBox7.Size = New System.Drawing.Size(48, 20) Me.TextBox7.TabIndex = 34 @@ -684,7 +687,7 @@ Partial Class usrctlProcedures ' 'Button21 ' - Me.Button21.Location = New System.Drawing.Point(219, 173) + Me.Button21.Location = New System.Drawing.Point(223, 268) Me.Button21.Name = "Button21" Me.Button21.Size = New System.Drawing.Size(145, 49) Me.Button21.TabIndex = 35 @@ -694,7 +697,7 @@ Partial Class usrctlProcedures 'Label9 ' Me.Label9.AutoSize = True - Me.Label9.Location = New System.Drawing.Point(225, 159) + Me.Label9.Location = New System.Drawing.Point(229, 254) Me.Label9.Name = "Label9" Me.Label9.Size = New System.Drawing.Size(42, 13) Me.Label9.TabIndex = 37 @@ -702,7 +705,7 @@ Partial Class usrctlProcedures ' 'TextBox8 ' - Me.TextBox8.Location = New System.Drawing.Point(273, 156) + Me.TextBox8.Location = New System.Drawing.Point(277, 251) Me.TextBox8.Name = "TextBox8" Me.TextBox8.Size = New System.Drawing.Size(91, 20) Me.TextBox8.TabIndex = 36 @@ -710,7 +713,7 @@ Partial Class usrctlProcedures ' 'txt ' - Me.txt.Location = New System.Drawing.Point(343, 238) + Me.txt.Location = New System.Drawing.Point(347, 332) Me.txt.Multiline = True Me.txt.Name = "txt" Me.txt.ScrollBars = System.Windows.Forms.ScrollBars.Vertical @@ -719,7 +722,7 @@ Partial Class usrctlProcedures ' 'TextBox9 ' - Me.TextBox9.Location = New System.Drawing.Point(468, 238) + Me.TextBox9.Location = New System.Drawing.Point(472, 332) Me.TextBox9.Multiline = True Me.TextBox9.Name = "TextBox9" Me.TextBox9.ScrollBars = System.Windows.Forms.ScrollBars.Vertical @@ -728,7 +731,7 @@ Partial Class usrctlProcedures ' 'Button22 ' - Me.Button22.Location = New System.Drawing.Point(364, 173) + Me.Button22.Location = New System.Drawing.Point(368, 268) Me.Button22.Name = "Button22" Me.Button22.Size = New System.Drawing.Size(154, 49) Me.Button22.TabIndex = 40 @@ -737,7 +740,7 @@ Partial Class usrctlProcedures ' 'Button23 ' - Me.Button23.Location = New System.Drawing.Point(618, 344) + Me.Button23.Location = New System.Drawing.Point(622, 438) Me.Button23.Name = "Button23" Me.Button23.Size = New System.Drawing.Size(75, 23) Me.Button23.TabIndex = 41 @@ -745,7 +748,7 @@ Partial Class usrctlProcedures ' 'Button24 ' - Me.Button24.Location = New System.Drawing.Point(583, 50) + Me.Button24.Location = New System.Drawing.Point(587, 144) Me.Button24.Name = "Button24" Me.Button24.Size = New System.Drawing.Size(145, 49) Me.Button24.TabIndex = 42 @@ -757,7 +760,7 @@ Partial Class usrctlProcedures Me.CheckBox3.AutoSize = True Me.CheckBox3.Checked = True Me.CheckBox3.CheckState = System.Windows.Forms.CheckState.Checked - Me.CheckBox3.Location = New System.Drawing.Point(583, 24) + Me.CheckBox3.Location = New System.Drawing.Point(587, 118) Me.CheckBox3.Name = "CheckBox3" Me.CheckBox3.Size = New System.Drawing.Size(98, 17) Me.CheckBox3.TabIndex = 43 @@ -766,7 +769,7 @@ Partial Class usrctlProcedures ' 'Button25 ' - Me.Button25.Location = New System.Drawing.Point(583, 102) + Me.Button25.Location = New System.Drawing.Point(587, 196) Me.Button25.Name = "Button25" Me.Button25.Size = New System.Drawing.Size(145, 49) Me.Button25.TabIndex = 44 @@ -775,7 +778,7 @@ Partial Class usrctlProcedures ' 'Label10 ' - Me.Label10.Location = New System.Drawing.Point(579, 154) + Me.Label10.Location = New System.Drawing.Point(583, 248) Me.Label10.Name = "Label10" Me.Label10.Size = New System.Drawing.Size(145, 13) Me.Label10.TabIndex = 45 @@ -784,7 +787,7 @@ Partial Class usrctlProcedures ' 'TextBox10 ' - Me.TextBox10.Location = New System.Drawing.Point(690, 335) + Me.TextBox10.Location = New System.Drawing.Point(694, 429) Me.TextBox10.Multiline = True Me.TextBox10.Name = "TextBox10" Me.TextBox10.ScrollBars = System.Windows.Forms.ScrollBars.Vertical @@ -793,7 +796,7 @@ Partial Class usrctlProcedures ' 'TextBox11 ' - Me.TextBox11.Location = New System.Drawing.Point(820, 335) + Me.TextBox11.Location = New System.Drawing.Point(824, 429) Me.TextBox11.Multiline = True Me.TextBox11.Name = "TextBox11" Me.TextBox11.ScrollBars = System.Windows.Forms.ScrollBars.Vertical @@ -802,7 +805,7 @@ Partial Class usrctlProcedures ' 'TextBox12 ' - Me.TextBox12.Location = New System.Drawing.Point(690, 450) + Me.TextBox12.Location = New System.Drawing.Point(694, 544) Me.TextBox12.Multiline = True Me.TextBox12.Name = "TextBox12" Me.TextBox12.ScrollBars = System.Windows.Forms.ScrollBars.Vertical @@ -812,7 +815,7 @@ Partial Class usrctlProcedures 'Label11 ' Me.Label11.AutoSize = True - Me.Label11.Location = New System.Drawing.Point(687, 319) + Me.Label11.Location = New System.Drawing.Point(691, 413) Me.Label11.Name = "Label11" Me.Label11.Size = New System.Drawing.Size(94, 13) Me.Label11.TabIndex = 28 @@ -821,7 +824,7 @@ Partial Class usrctlProcedures 'Label12 ' Me.Label12.AutoSize = True - Me.Label12.Location = New System.Drawing.Point(817, 319) + Me.Label12.Location = New System.Drawing.Point(821, 413) Me.Label12.Name = "Label12" Me.Label12.Size = New System.Drawing.Size(96, 13) Me.Label12.TabIndex = 28 @@ -830,7 +833,7 @@ Partial Class usrctlProcedures 'Label13 ' Me.Label13.AutoSize = True - Me.Label13.Location = New System.Drawing.Point(687, 434) + Me.Label13.Location = New System.Drawing.Point(691, 528) Me.Label13.Name = "Label13" Me.Label13.Size = New System.Drawing.Size(119, 13) Me.Label13.TabIndex = 28 @@ -838,7 +841,7 @@ Partial Class usrctlProcedures ' 'Button26 ' - Me.Button26.Location = New System.Drawing.Point(755, 104) + Me.Button26.Location = New System.Drawing.Point(759, 198) Me.Button26.Name = "Button26" Me.Button26.Size = New System.Drawing.Size(145, 49) Me.Button26.TabIndex = 54 @@ -847,7 +850,7 @@ Partial Class usrctlProcedures ' 'Button27 ' - Me.Button27.Location = New System.Drawing.Point(756, 50) + Me.Button27.Location = New System.Drawing.Point(760, 144) Me.Button27.Name = "Button27" Me.Button27.Size = New System.Drawing.Size(145, 49) Me.Button27.TabIndex = 50 @@ -859,7 +862,7 @@ Partial Class usrctlProcedures Me.CheckBox4.AutoSize = True Me.CheckBox4.Checked = True Me.CheckBox4.CheckState = System.Windows.Forms.CheckState.Checked - Me.CheckBox4.Location = New System.Drawing.Point(756, 24) + Me.CheckBox4.Location = New System.Drawing.Point(760, 118) Me.CheckBox4.Name = "CheckBox4" Me.CheckBox4.Size = New System.Drawing.Size(98, 17) Me.CheckBox4.TabIndex = 51 @@ -868,7 +871,7 @@ Partial Class usrctlProcedures ' 'Label14 ' - Me.Label14.Location = New System.Drawing.Point(756, 156) + Me.Label14.Location = New System.Drawing.Point(760, 250) Me.Label14.Name = "Label14" Me.Label14.Size = New System.Drawing.Size(145, 13) Me.Label14.TabIndex = 53 @@ -877,7 +880,7 @@ Partial Class usrctlProcedures ' 'Label15 ' - Me.Label15.Location = New System.Drawing.Point(756, 254) + Me.Label15.Location = New System.Drawing.Point(760, 348) Me.Label15.Name = "Label15" Me.Label15.Size = New System.Drawing.Size(145, 13) Me.Label15.TabIndex = 57 @@ -889,7 +892,7 @@ Partial Class usrctlProcedures Me.CheckBox5.AutoSize = True Me.CheckBox5.Checked = True Me.CheckBox5.CheckState = System.Windows.Forms.CheckState.Checked - Me.CheckBox5.Location = New System.Drawing.Point(756, 179) + Me.CheckBox5.Location = New System.Drawing.Point(760, 273) Me.CheckBox5.Name = "CheckBox5" Me.CheckBox5.Size = New System.Drawing.Size(98, 17) Me.CheckBox5.TabIndex = 56 @@ -898,7 +901,7 @@ Partial Class usrctlProcedures ' 'Button29 ' - Me.Button29.Location = New System.Drawing.Point(755, 202) + Me.Button29.Location = New System.Drawing.Point(759, 296) Me.Button29.Name = "Button29" Me.Button29.Size = New System.Drawing.Size(145, 49) Me.Button29.TabIndex = 58 @@ -907,7 +910,7 @@ Partial Class usrctlProcedures ' 'Button28 ' - Me.Button28.Location = New System.Drawing.Point(598, 258) + Me.Button28.Location = New System.Drawing.Point(602, 352) Me.Button28.Name = "Button28" Me.Button28.Size = New System.Drawing.Size(145, 49) Me.Button28.TabIndex = 59 @@ -916,17 +919,47 @@ Partial Class usrctlProcedures ' 'Button30 ' - Me.Button30.Location = New System.Drawing.Point(579, 179) + Me.Button30.Location = New System.Drawing.Point(583, 273) Me.Button30.Name = "Button30" Me.Button30.Size = New System.Drawing.Size(145, 49) Me.Button30.TabIndex = 60 Me.Button30.Text = "GOOGLE" Me.Button30.UseVisualStyleBackColor = True ' + 'Button31 + ' + Me.Button31.Location = New System.Drawing.Point(68, 29) + Me.Button31.Name = "Button31" + Me.Button31.Size = New System.Drawing.Size(145, 49) + Me.Button31.TabIndex = 61 + Me.Button31.Text = "TAPI" + Me.Button31.UseVisualStyleBackColor = True + ' + 'Button32 + ' + Me.Button32.Location = New System.Drawing.Point(232, 29) + Me.Button32.Name = "Button32" + Me.Button32.Size = New System.Drawing.Size(145, 49) + Me.Button32.TabIndex = 62 + Me.Button32.Text = "TAPI" + Me.Button32.UseVisualStyleBackColor = True + ' + 'lblStatus + ' + Me.lblStatus.AutoSize = True + Me.lblStatus.Location = New System.Drawing.Point(110, 81) + Me.lblStatus.Name = "lblStatus" + Me.lblStatus.Size = New System.Drawing.Size(39, 13) + Me.lblStatus.TabIndex = 63 + Me.lblStatus.Text = "Zeilen:" + ' 'usrctlProcedures ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.lblStatus) + Me.Controls.Add(Me.Button32) + Me.Controls.Add(Me.Button31) Me.Controls.Add(Me.Button30) Me.Controls.Add(Me.Button28) Me.Controls.Add(Me.Label15) @@ -975,7 +1008,7 @@ Partial Class usrctlProcedures Me.Controls.Add(Me.TabControl1) Me.Controls.Add(Me.Button26) Me.Name = "usrctlProcedures" - Me.Size = New System.Drawing.Size(931, 546) + Me.Size = New System.Drawing.Size(931, 724) Me.TabControl1.ResumeLayout(False) Me.TabPage1.ResumeLayout(False) Me.TabPage1.PerformLayout() @@ -1076,4 +1109,7 @@ Partial Class usrctlProcedures Friend WithEvents Button29 As Button Friend WithEvents Button28 As Button Friend WithEvents Button30 As Button + Friend WithEvents Button31 As Button + Friend WithEvents Button32 As Button + Friend WithEvents lblStatus As Label End Class diff --git a/UID/usrctlProcedures.resx b/UID/usrctlProcedures.resx index 508fc32..c9977e7 100644 --- a/UID/usrctlProcedures.resx +++ b/UID/usrctlProcedures.resx @@ -123,4 +123,10 @@ True + + True + + + True + \ No newline at end of file diff --git a/UID/usrctlProcedures.vb b/UID/usrctlProcedures.vb index 8a211ca..42c43d7 100644 --- a/UID/usrctlProcedures.vb +++ b/UID/usrctlProcedures.vb @@ -15,10 +15,193 @@ Imports System.Text Imports System.Xml.Serialization Imports System.Xml Imports System.Data.OleDb - 'Imports Microsoft.Office.Interop Public Class usrctlProcedures + + + + + 'Private hwAddress As TAddress = Nothing + 'Private mediaTypes As Integer + + 'Private WithEvents tapiCls As TTapi + 'Private Const mediaAudio = JulMar.Tapi3.TAPIMEDIATYPES.AUDIO + 'Private Const mediaData = JulMar.Tapi3.TAPIMEDIATYPES.DATAMODEM + 'Private Const mediaVideo = JulMar.Tapi3.TAPIMEDIATYPES.VIDEO + 'Private Const mediaFax = JulMar.Tapi3.TAPIMEDIATYPES.G3FAX + 'Private Const mediaMultitrack = JulMar.Tapi3.TAPIMEDIATYPES.MULTITRACK + + 'Private offeringCall As Boolean = False + 'Private connectedCall As Boolean = False + 'Private inProgressCall As Boolean = False + + 'Private incomingCall As TCall + + 'Public Sub New() + + ' tapiCls = New TTapi + ' tapiCls.Initialize() + + ' 'Discover all hardware addresses + ' 'Make "And" function to discover different media devices + + ' For Each address In tapiCls.Addresses + ' If address.State = ADDRESS_STATE.AS_INSERVICE Then + ' mediaTypes = address.MediaTypes + + ' 'We discover and select the audio device usually to be a modem + ' If (mediaTypes And mediaAudio) = mediaAudio Then + + ' hwAddress = address + ' hwAddress.Open(mediaAudio) + ' 'This will show the name of the audio devices discovered + ' 'MsgBox(hwAddress.AddressName.ToString) + + ' End If + + ' End If + ' Next + + ' 'If an hardware has not been found + ' If hwAddress Is Nothing Then + + ' 'Hardware address not found + + ' End If + + 'End Sub + + 'Public Sub openLine() + ' 'Put modem wake up to listem to the line + ' Try + ' If hwAddress.State = ADDRESS_STATE.AS_INSERVICE Then + ' hwAddress.Open(mediaAudio) + ' End If + + ' Catch ex As Exception + ' 'Manage the exception + ' End Try + + 'End Sub + + 'Public Sub closeLine() + ' 'Put modem shut down + ' Try + ' If hwAddress.State = ADDRESS_STATE.AS_INSERVICE Then + ' hwAddress.Close() + ' End If + + ' Catch ex As Exception + + ' 'Manage the exception + ' End Try + + 'End Sub + + 'Public Sub answerCall() + ' If offeringCall = True Then + ' incomingCall.Answer() + ' End If + 'End Sub + + 'Public Sub hungup() + ' If connectedCall = True Then + ' incomingCall.Disconnect(DISCONNECT_CODE.DC_REJECTED) + ' End If + 'End Sub + + 'Private Sub tapiCallNotification_Event(ByVal sender As Object, + ' ByVal e As TapiCallNotificationEventArgs) Handles tapiCls.TE_CALLNOTIFICATION + ' 'MsgBox("Call notification") + + ' Select Case e.Event + ' Case CALL_NOTIFICATION_EVENT.CNE_MONITOR + ' 'Choose you action + ' Case CALL_NOTIFICATION_EVENT.CNE_OWNER + ' 'Choose you action + ' End Select + 'End Sub + + 'Private Sub tapiInfoChange_Event(ByVal sender As Object, + ' ByVal e As TapiCallInfoChangeEventArgs) Handles tapiCls.TE_CALLINFOCHANGE + ' Dim callerNumber As String = "" + + ' Try + + ' callerNumber = e.Call.CallInfo(CALLINFO_STRING.CIS_CALLERIDNUMBER).ToString + + ' If callerNumber.Length = 0 Then + ' 'Hidden number + + ' Else + ' 'Clear number + + ' End If + + ' Catch ex As Exception + + ' 'Manage the exception + + ' End Try + + + 'End Sub + + 'Private Sub tapiGeneral_Event(ByVal sender As Object, + ' ByVal e As TapiCallStateEventArgs) Handles tapiCls.TE_CALLSTATE + + ' ' MsgBox(e.State.ToString) + + ' Select Case e.State + + ' Case CALL_STATE.CS_UNKNOWN + + ' Case CALL_STATE.CS_OFFERING + ' 'When a call is coming in during the ring tone + ' offeringCall = True + + ' Case CALL_STATE.CS_CONNECTED + ' 'When a call is answered + ' connectedCall = True + ' offeringCall = False + + ' Case CALL_STATE.CS_HOLD + ' Case CALL_STATE.CS_IDLE + ' Case CALL_STATE.CS_INPROGRESS + ' Case CALL_STATE.CS_QUEUED + ' Case CALL_STATE.CS_DISCONNECTED + ' 'When a call is in conversation or closed + ' connectedCall = False + ' End Select + + 'End Sub + + 'Private Sub tapiGenerate_Event(ByVal sender As Object, + ' ByVal e As TapiDigitGenerationEventArgs) Handles tapiCls.TE_GENERATEEVENT + ' ' MsgBox("GENERATE") + 'End Sub + + 'Private Sub tapiSpecific_Event(ByVal sender As Object, + ' ByVal e As TapiAddressDeviceSpecificEventArgs) Handles tapiCls.TE_ADDRESSDEVSPECIFIC + ' ' MsgBox("SPECIFIC EVENTS") + 'End Sub + + 'Private Sub tapiObject_Event(ByVal sender As Object, + ' ByVal e As TapiObjectEventArgs) Handles tapiCls.TE_TAPIOBJECT + ' 'MsgBox("tapi object") + 'End Sub + + 'Private Sub tapiPhone_Event(ByVal sender As Object, + ' ByVal e As TapiPhoneEventArgs) Handles tapiCls.TE_PHONEEVENT + ' 'MsgBox("Phone events") + 'End Sub + 'Private Sub tapiDigit_Event(ByVal sender As Object, + ' ByVal e As TapiDigitDetectionEventArgs) Handles tapiCls.TE_DIGITEVENT + ' 'MsgBox("Digit detection events") + 'End Sub + + 'Inherits UserControl 'Public Sub New() ' InitializeComponent() @@ -3259,6 +3442,7 @@ Public Class usrctlProcedures VERAG_PROG_ALLGEMEIN.cGoogleAPI.test() End Sub + 'Private Sub Button26_Click(sender As Object, e As EventArgs) ' For Each d In System.IO.Directory.GetDirectories("\\192.168.0.91\Datenarchiv\DAKOSY\ECHTSYSTEM\Nachrichtendaten_Ablage\2019") ' Dim fi As New FileInfo(d) diff --git a/VERAGMonitoring/My Project/Resources.Designer.vb b/VERAGMonitoring/My Project/Resources.Designer.vb index 1ee9547..c561ee1 100644 --- a/VERAGMonitoring/My Project/Resources.Designer.vb +++ b/VERAGMonitoring/My Project/Resources.Designer.vb @@ -71,7 +71,16 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 1.3.9 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. + ''' + Friend ReadOnly Property sdf2sdf21sdfds() As String + Get + Return ResourceManager.GetString("sdf2sdf21sdfds", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die 1.4.2 ähnelt. ''' Friend ReadOnly Property version() As String Get diff --git a/VERAGMonitoring/My Project/Resources.resx b/VERAGMonitoring/My Project/Resources.resx index b7b5d49..f8ad7e4 100644 --- a/VERAGMonitoring/My Project/Resources.resx +++ b/VERAGMonitoring/My Project/Resources.resx @@ -118,10 +118,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 1.3.9 + 1.4.2 ..\Resources\refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + \ No newline at end of file diff --git a/VERAGMonitoring/VERAGMonitoring.vbproj b/VERAGMonitoring/VERAGMonitoring.vbproj index c29b6cd..21c65de 100644 --- a/VERAGMonitoring/VERAGMonitoring.vbproj +++ b/VERAGMonitoring/VERAGMonitoring.vbproj @@ -15,7 +15,7 @@ - AnyCPU + x64 true full true diff --git a/VERAGMonitoring/cClasses.vb b/VERAGMonitoring/cClasses.vb index cbe0bf9..b9fff0b 100644 --- a/VERAGMonitoring/cClasses.vb +++ b/VERAGMonitoring/cClasses.vb @@ -61,6 +61,12 @@ Public Class cMonitoringBrg Property brgusrset_gvvAt_ATILLA_tag_warn2 As Double = 0.0 Property brgusrset_gvvAt_ATILLA_woche_warn1 As Double = 0.0 Property brgusrset_gvvAt_ATILLA_woche_warn2 As Double = 0.0 + + Property brgusrset_gvvAt_VERAG_CS_de_summe As Double = 0.0 + Property brgusrset_gvvAt_VERAG_CS_tag_warn1 As Double = 0.0 + Property brgusrset_gvvAt_VERAG_CS_tag_warn2 As Double = 0.0 + Property brgusrset_gvvAt_VERAG_CS_woche_warn1 As Double = 0.0 + Property brgusrset_gvvAt_VERAG_CS_woche_warn2 As Double = 0.0 End Class diff --git a/VERAGMonitoring/cSqlDb.vb b/VERAGMonitoring/cSqlDb.vb index 1d93809..07b1497 100644 --- a/VERAGMonitoring/cSqlDb.vb +++ b/VERAGMonitoring/cSqlDb.vb @@ -665,7 +665,7 @@ Public Class cBrgDb from tblTelotec_Sicherheit inner join [tblTelotec_Anmeldung] on telanm_id = telgrt_telanmId where [tblTelotec_Anmeldung].[dec_CreateDate] BETWEEN '" & datumVon.ToShortDateString & " 00:00:00' AND '" & datumBis.ToShortDateString & " 23:23:59' AND telanm_Status BETWEEN '" & statusVon & "' AND '" & statusBis & "' AND GRN = '" & buergschaft & "' AND [telnam_aktuellsteNachricht]=1 " - 'MsgBox(sql) + ' MsgBox(sql) Dim dr As SqlDataReader Dim daten As New List(Of cBuergschaft) Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL() @@ -1042,6 +1042,7 @@ Public Class cBrgDb " FROM tblZolaris_EZoll_NCTS WHERE ( AnmeldungsDatum BETWEEN '" & datumVon & "' AND '" & datumBis & "') AND GRN = '" & buergschaft & "' " & where ' Dim daten As New List(Of cEntry) Dim dr As SqlDataReader + Dim daten As New List(Of cBuergschaft) Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL() Using cmd As New SqlCommand(sql, conn) diff --git a/VERAGMonitoring/frmMain.Designer.vb b/VERAGMonitoring/frmMain.Designer.vb index e0d3b65..27497ed 100644 --- a/VERAGMonitoring/frmMain.Designer.vb +++ b/VERAGMonitoring/frmMain.Designer.vb @@ -25,6 +25,12 @@ Partial Class frmMain Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) Me.Panel2 = New System.Windows.Forms.Panel() + Me.cbxBrg_at_VERAG_CS = New System.Windows.Forms.CheckBox() + Me.lblBrg_at_VERAG_CS = New System.Windows.Forms.Label() + Me.lblAtWocheVERAG_CS = New System.Windows.Forms.Label() + Me.lblAtTagVERAG_CS = New System.Windows.Forms.Label() + Me.lblAt_woche_StatusVERAG_CS = New System.Windows.Forms.Label() + Me.lblAt_tag_StatusVERAG_CS = New System.Windows.Forms.Label() Me.Button3 = New System.Windows.Forms.Button() Me.lblAufschubBrgEUST_de_UNISPEDDE_oE = New System.Windows.Forms.Label() Me.cbxAufschubEUST_de_UnispedDE = New System.Windows.Forms.CheckBox() @@ -165,6 +171,12 @@ Partial Class frmMain 'Panel2 ' Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel2.Controls.Add(Me.cbxBrg_at_VERAG_CS) + Me.Panel2.Controls.Add(Me.lblBrg_at_VERAG_CS) + Me.Panel2.Controls.Add(Me.lblAtWocheVERAG_CS) + Me.Panel2.Controls.Add(Me.lblAtTagVERAG_CS) + Me.Panel2.Controls.Add(Me.lblAt_woche_StatusVERAG_CS) + Me.Panel2.Controls.Add(Me.lblAt_tag_StatusVERAG_CS) Me.Panel2.Controls.Add(Me.Button3) Me.Panel2.Controls.Add(Me.lblAufschubBrgEUST_de_UNISPEDDE_oE) Me.Panel2.Controls.Add(Me.cbxAufschubEUST_de_UnispedDE) @@ -284,9 +296,83 @@ Partial Class frmMain Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel2.Location = New System.Drawing.Point(0, 0) Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(671, 608) + Me.Panel2.Size = New System.Drawing.Size(671, 627) Me.Panel2.TabIndex = 8 ' + 'cbxBrg_at_VERAG_CS + ' + Me.cbxBrg_at_VERAG_CS.AutoSize = True + Me.cbxBrg_at_VERAG_CS.Enabled = False + Me.cbxBrg_at_VERAG_CS.Location = New System.Drawing.Point(9, 232) + Me.cbxBrg_at_VERAG_CS.Name = "cbxBrg_at_VERAG_CS" + Me.cbxBrg_at_VERAG_CS.Size = New System.Drawing.Size(15, 14) + Me.cbxBrg_at_VERAG_CS.TabIndex = 93 + Me.cbxBrg_at_VERAG_CS.UseVisualStyleBackColor = True + ' + 'lblBrg_at_VERAG_CS + ' + Me.lblBrg_at_VERAG_CS.AutoSize = True + Me.lblBrg_at_VERAG_CS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblBrg_at_VERAG_CS.Location = New System.Drawing.Point(24, 233) + Me.lblBrg_at_VERAG_CS.Name = "lblBrg_at_VERAG_CS" + Me.lblBrg_at_VERAG_CS.Size = New System.Drawing.Size(290, 13) + Me.lblBrg_at_VERAG_CS.TabIndex = 88 + Me.lblBrg_at_VERAG_CS.Text = "AT - gVV - HZA Linz/Wels VERAG Customs Service GmbH" + ' + 'lblAtWocheVERAG_CS + ' + Me.lblAtWocheVERAG_CS.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblAtWocheVERAG_CS.Cursor = System.Windows.Forms.Cursors.Hand + Me.lblAtWocheVERAG_CS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblAtWocheVERAG_CS.Location = New System.Drawing.Point(534, 232) + Me.lblAtWocheVERAG_CS.Name = "lblAtWocheVERAG_CS" + Me.lblAtWocheVERAG_CS.RightToLeft = System.Windows.Forms.RightToLeft.Yes + Me.lblAtWocheVERAG_CS.Size = New System.Drawing.Size(90, 13) + Me.lblAtWocheVERAG_CS.TabIndex = 89 + Me.lblAtWocheVERAG_CS.Text = " 0 €" + ' + 'lblAtTagVERAG_CS + ' + Me.lblAtTagVERAG_CS.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblAtTagVERAG_CS.Cursor = System.Windows.Forms.Cursors.Hand + Me.lblAtTagVERAG_CS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblAtTagVERAG_CS.Location = New System.Drawing.Point(385, 233) + Me.lblAtTagVERAG_CS.Name = "lblAtTagVERAG_CS" + Me.lblAtTagVERAG_CS.RightToLeft = System.Windows.Forms.RightToLeft.Yes + Me.lblAtTagVERAG_CS.Size = New System.Drawing.Size(90, 13) + Me.lblAtTagVERAG_CS.TabIndex = 90 + Me.lblAtTagVERAG_CS.Text = " 0 €" + ' + 'lblAt_woche_StatusVERAG_CS + ' + Me.lblAt_woche_StatusVERAG_CS.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblAt_woche_StatusVERAG_CS.AutoSize = True + Me.lblAt_woche_StatusVERAG_CS.BackColor = System.Drawing.Color.Green + Me.lblAt_woche_StatusVERAG_CS.Cursor = System.Windows.Forms.Cursors.Help + Me.lblAt_woche_StatusVERAG_CS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblAt_woche_StatusVERAG_CS.ForeColor = System.Drawing.Color.White + Me.lblAt_woche_StatusVERAG_CS.Location = New System.Drawing.Point(630, 232) + Me.lblAt_woche_StatusVERAG_CS.Name = "lblAt_woche_StatusVERAG_CS" + Me.lblAt_woche_StatusVERAG_CS.RightToLeft = System.Windows.Forms.RightToLeft.Yes + Me.lblAt_woche_StatusVERAG_CS.Size = New System.Drawing.Size(22, 13) + Me.lblAt_woche_StatusVERAG_CS.TabIndex = 91 + Me.lblAt_woche_StatusVERAG_CS.Text = "OK" + ' + 'lblAt_tag_StatusVERAG_CS + ' + Me.lblAt_tag_StatusVERAG_CS.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.lblAt_tag_StatusVERAG_CS.AutoSize = True + Me.lblAt_tag_StatusVERAG_CS.BackColor = System.Drawing.Color.Green + Me.lblAt_tag_StatusVERAG_CS.Cursor = System.Windows.Forms.Cursors.Help + Me.lblAt_tag_StatusVERAG_CS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblAt_tag_StatusVERAG_CS.ForeColor = System.Drawing.Color.White + Me.lblAt_tag_StatusVERAG_CS.Location = New System.Drawing.Point(483, 233) + Me.lblAt_tag_StatusVERAG_CS.Name = "lblAt_tag_StatusVERAG_CS" + Me.lblAt_tag_StatusVERAG_CS.RightToLeft = System.Windows.Forms.RightToLeft.Yes + Me.lblAt_tag_StatusVERAG_CS.Size = New System.Drawing.Size(22, 13) + Me.lblAt_tag_StatusVERAG_CS.TabIndex = 92 + Me.lblAt_tag_StatusVERAG_CS.Text = "OK" + ' 'Button3 ' Me.Button3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) @@ -296,7 +382,7 @@ Partial Class frmMain Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Button3.ForeColor = System.Drawing.Color.White - Me.Button3.Location = New System.Drawing.Point(501, 574) + Me.Button3.Location = New System.Drawing.Point(501, 594) Me.Button3.Name = "Button3" Me.Button3.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.Button3.Size = New System.Drawing.Size(45, 24) @@ -309,7 +395,7 @@ Partial Class frmMain Me.lblAufschubBrgEUST_de_UNISPEDDE_oE.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrgEUST_de_UNISPEDDE_oE.Cursor = System.Windows.Forms.Cursors.Default Me.lblAufschubBrgEUST_de_UNISPEDDE_oE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrgEUST_de_UNISPEDDE_oE.Location = New System.Drawing.Point(413, 436) + Me.lblAufschubBrgEUST_de_UNISPEDDE_oE.Location = New System.Drawing.Point(413, 456) Me.lblAufschubBrgEUST_de_UNISPEDDE_oE.Name = "lblAufschubBrgEUST_de_UNISPEDDE_oE" Me.lblAufschubBrgEUST_de_UNISPEDDE_oE.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrgEUST_de_UNISPEDDE_oE.Size = New System.Drawing.Size(90, 13) @@ -320,7 +406,7 @@ Partial Class frmMain ' Me.cbxAufschubEUST_de_UnispedDE.AutoSize = True Me.cbxAufschubEUST_de_UnispedDE.Enabled = False - Me.cbxAufschubEUST_de_UnispedDE.Location = New System.Drawing.Point(9, 437) + Me.cbxAufschubEUST_de_UnispedDE.Location = New System.Drawing.Point(9, 457) Me.cbxAufschubEUST_de_UnispedDE.Name = "cbxAufschubEUST_de_UnispedDE" Me.cbxAufschubEUST_de_UnispedDE.Size = New System.Drawing.Size(15, 14) Me.cbxAufschubEUST_de_UnispedDE.TabIndex = 86 @@ -330,7 +416,7 @@ Partial Class frmMain ' Me.lblAufschubEUST_de_UNISPEDDE.AutoSize = True Me.lblAufschubEUST_de_UNISPEDDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubEUST_de_UNISPEDDE.Location = New System.Drawing.Point(26, 437) + Me.lblAufschubEUST_de_UNISPEDDE.Location = New System.Drawing.Point(26, 457) Me.lblAufschubEUST_de_UNISPEDDE.Name = "lblAufschubEUST_de_UNISPEDDE" Me.lblAufschubEUST_de_UNISPEDDE.Size = New System.Drawing.Size(266, 13) Me.lblAufschubEUST_de_UNISPEDDE.TabIndex = 83 @@ -341,7 +427,7 @@ Partial Class frmMain Me.lblAufschubBrgEUST_de_UNISPEDDE.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrgEUST_de_UNISPEDDE.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubBrgEUST_de_UNISPEDDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrgEUST_de_UNISPEDDE.Location = New System.Drawing.Point(534, 436) + Me.lblAufschubBrgEUST_de_UNISPEDDE.Location = New System.Drawing.Point(534, 456) Me.lblAufschubBrgEUST_de_UNISPEDDE.Name = "lblAufschubBrgEUST_de_UNISPEDDE" Me.lblAufschubBrgEUST_de_UNISPEDDE.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrgEUST_de_UNISPEDDE.Size = New System.Drawing.Size(90, 13) @@ -356,7 +442,7 @@ Partial Class frmMain Me.lblAufschubStatusEUST_de_UNISPEDDE.Cursor = System.Windows.Forms.Cursors.Help Me.lblAufschubStatusEUST_de_UNISPEDDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAufschubStatusEUST_de_UNISPEDDE.ForeColor = System.Drawing.Color.White - Me.lblAufschubStatusEUST_de_UNISPEDDE.Location = New System.Drawing.Point(630, 436) + Me.lblAufschubStatusEUST_de_UNISPEDDE.Location = New System.Drawing.Point(630, 456) Me.lblAufschubStatusEUST_de_UNISPEDDE.Name = "lblAufschubStatusEUST_de_UNISPEDDE" Me.lblAufschubStatusEUST_de_UNISPEDDE.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubStatusEUST_de_UNISPEDDE.Size = New System.Drawing.Size(22, 13) @@ -368,7 +454,7 @@ Partial Class frmMain Me.lblAufschubBrg_de_UNISPEDDE_oE.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrg_de_UNISPEDDE_oE.Cursor = System.Windows.Forms.Cursors.Default Me.lblAufschubBrg_de_UNISPEDDE_oE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrg_de_UNISPEDDE_oE.Location = New System.Drawing.Point(413, 418) + Me.lblAufschubBrg_de_UNISPEDDE_oE.Location = New System.Drawing.Point(413, 438) Me.lblAufschubBrg_de_UNISPEDDE_oE.Name = "lblAufschubBrg_de_UNISPEDDE_oE" Me.lblAufschubBrg_de_UNISPEDDE_oE.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrg_de_UNISPEDDE_oE.Size = New System.Drawing.Size(90, 13) @@ -379,7 +465,7 @@ Partial Class frmMain ' Me.cbxAufschub_de_UnispedDE.AutoSize = True Me.cbxAufschub_de_UnispedDE.Enabled = False - Me.cbxAufschub_de_UnispedDE.Location = New System.Drawing.Point(9, 419) + Me.cbxAufschub_de_UnispedDE.Location = New System.Drawing.Point(9, 439) Me.cbxAufschub_de_UnispedDE.Name = "cbxAufschub_de_UnispedDE" Me.cbxAufschub_de_UnispedDE.Size = New System.Drawing.Size(15, 14) Me.cbxAufschub_de_UnispedDE.TabIndex = 81 @@ -389,7 +475,7 @@ Partial Class frmMain ' Me.lblAufschub_de_UNISPEDDE.AutoSize = True Me.lblAufschub_de_UNISPEDDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschub_de_UNISPEDDE.Location = New System.Drawing.Point(26, 419) + Me.lblAufschub_de_UNISPEDDE.Location = New System.Drawing.Point(26, 439) Me.lblAufschub_de_UNISPEDDE.Name = "lblAufschub_de_UNISPEDDE" Me.lblAufschub_de_UNISPEDDE.Size = New System.Drawing.Size(264, 13) Me.lblAufschub_de_UNISPEDDE.TabIndex = 78 @@ -400,7 +486,7 @@ Partial Class frmMain Me.lblAufschubBrg_de_UNISPEDDE.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrg_de_UNISPEDDE.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubBrg_de_UNISPEDDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrg_de_UNISPEDDE.Location = New System.Drawing.Point(534, 418) + Me.lblAufschubBrg_de_UNISPEDDE.Location = New System.Drawing.Point(534, 438) Me.lblAufschubBrg_de_UNISPEDDE.Name = "lblAufschubBrg_de_UNISPEDDE" Me.lblAufschubBrg_de_UNISPEDDE.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrg_de_UNISPEDDE.Size = New System.Drawing.Size(90, 13) @@ -415,7 +501,7 @@ Partial Class frmMain Me.lblAufschubStatus_de_UNISPEDDE.Cursor = System.Windows.Forms.Cursors.Help Me.lblAufschubStatus_de_UNISPEDDE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAufschubStatus_de_UNISPEDDE.ForeColor = System.Drawing.Color.White - Me.lblAufschubStatus_de_UNISPEDDE.Location = New System.Drawing.Point(630, 418) + Me.lblAufschubStatus_de_UNISPEDDE.Location = New System.Drawing.Point(630, 438) Me.lblAufschubStatus_de_UNISPEDDE.Name = "lblAufschubStatus_de_UNISPEDDE" Me.lblAufschubStatus_de_UNISPEDDE.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubStatus_de_UNISPEDDE.Size = New System.Drawing.Size(22, 13) @@ -427,7 +513,7 @@ Partial Class frmMain Me.lblAufschubBrgEUST_de_global_oE.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrgEUST_de_global_oE.Cursor = System.Windows.Forms.Cursors.Default Me.lblAufschubBrgEUST_de_global_oE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrgEUST_de_global_oE.Location = New System.Drawing.Point(413, 350) + Me.lblAufschubBrgEUST_de_global_oE.Location = New System.Drawing.Point(413, 370) Me.lblAufschubBrgEUST_de_global_oE.Name = "lblAufschubBrgEUST_de_global_oE" Me.lblAufschubBrgEUST_de_global_oE.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrgEUST_de_global_oE.Size = New System.Drawing.Size(90, 13) @@ -438,7 +524,7 @@ Partial Class frmMain ' Me.cbxAufschubEUST_de_Global.AutoSize = True Me.cbxAufschubEUST_de_Global.Enabled = False - Me.cbxAufschubEUST_de_Global.Location = New System.Drawing.Point(9, 351) + Me.cbxAufschubEUST_de_Global.Location = New System.Drawing.Point(9, 371) Me.cbxAufschubEUST_de_Global.Name = "cbxAufschubEUST_de_Global" Me.cbxAufschubEUST_de_Global.Size = New System.Drawing.Size(15, 14) Me.cbxAufschubEUST_de_Global.TabIndex = 76 @@ -448,7 +534,7 @@ Partial Class frmMain ' Me.lblAufschubEUST_de_Global.AutoSize = True Me.lblAufschubEUST_de_Global.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubEUST_de_Global.Location = New System.Drawing.Point(26, 351) + Me.lblAufschubEUST_de_Global.Location = New System.Drawing.Point(26, 371) Me.lblAufschubEUST_de_Global.Name = "lblAufschubEUST_de_Global" Me.lblAufschubEUST_de_Global.Size = New System.Drawing.Size(197, 13) Me.lblAufschubEUST_de_Global.TabIndex = 73 @@ -459,7 +545,7 @@ Partial Class frmMain Me.lblAufschubBrgEUST_de_global.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrgEUST_de_global.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubBrgEUST_de_global.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrgEUST_de_global.Location = New System.Drawing.Point(534, 350) + Me.lblAufschubBrgEUST_de_global.Location = New System.Drawing.Point(534, 370) Me.lblAufschubBrgEUST_de_global.Name = "lblAufschubBrgEUST_de_global" Me.lblAufschubBrgEUST_de_global.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrgEUST_de_global.Size = New System.Drawing.Size(90, 13) @@ -474,7 +560,7 @@ Partial Class frmMain Me.lblAufschubStatusEUST_de_global.Cursor = System.Windows.Forms.Cursors.Help Me.lblAufschubStatusEUST_de_global.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAufschubStatusEUST_de_global.ForeColor = System.Drawing.Color.White - Me.lblAufschubStatusEUST_de_global.Location = New System.Drawing.Point(630, 350) + Me.lblAufschubStatusEUST_de_global.Location = New System.Drawing.Point(630, 370) Me.lblAufschubStatusEUST_de_global.Name = "lblAufschubStatusEUST_de_global" Me.lblAufschubStatusEUST_de_global.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubStatusEUST_de_global.Size = New System.Drawing.Size(22, 13) @@ -485,7 +571,7 @@ Partial Class frmMain ' Me.cbxAufschub_at_IMEX.AutoSize = True Me.cbxAufschub_at_IMEX.Enabled = False - Me.cbxAufschub_at_IMEX.Location = New System.Drawing.Point(9, 546) + Me.cbxAufschub_at_IMEX.Location = New System.Drawing.Point(9, 566) Me.cbxAufschub_at_IMEX.Name = "cbxAufschub_at_IMEX" Me.cbxAufschub_at_IMEX.Size = New System.Drawing.Size(15, 14) Me.cbxAufschub_at_IMEX.TabIndex = 72 @@ -499,7 +585,7 @@ Partial Class frmMain Me.lblAufschubStatus_at_IMEX.Cursor = System.Windows.Forms.Cursors.Help Me.lblAufschubStatus_at_IMEX.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAufschubStatus_at_IMEX.ForeColor = System.Drawing.Color.White - Me.lblAufschubStatus_at_IMEX.Location = New System.Drawing.Point(630, 545) + Me.lblAufschubStatus_at_IMEX.Location = New System.Drawing.Point(630, 565) Me.lblAufschubStatus_at_IMEX.Name = "lblAufschubStatus_at_IMEX" Me.lblAufschubStatus_at_IMEX.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubStatus_at_IMEX.Size = New System.Drawing.Size(22, 13) @@ -511,7 +597,7 @@ Partial Class frmMain Me.lblAufschubBrg_at_IMEX.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrg_at_IMEX.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubBrg_at_IMEX.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrg_at_IMEX.Location = New System.Drawing.Point(534, 545) + Me.lblAufschubBrg_at_IMEX.Location = New System.Drawing.Point(534, 565) Me.lblAufschubBrg_at_IMEX.Name = "lblAufschubBrg_at_IMEX" Me.lblAufschubBrg_at_IMEX.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrg_at_IMEX.Size = New System.Drawing.Size(90, 13) @@ -522,7 +608,7 @@ Partial Class frmMain ' Me.lblAufschub_at_IMEX.AutoSize = True Me.lblAufschub_at_IMEX.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschub_at_IMEX.Location = New System.Drawing.Point(26, 546) + Me.lblAufschub_at_IMEX.Location = New System.Drawing.Point(26, 566) Me.lblAufschub_at_IMEX.Name = "lblAufschub_at_IMEX" Me.lblAufschub_at_IMEX.Size = New System.Drawing.Size(250, 13) Me.lblAufschub_at_IMEX.TabIndex = 71 @@ -532,7 +618,7 @@ Partial Class frmMain ' Me.cbxBrg_at_UNISPED.AutoSize = True Me.cbxBrg_at_UNISPED.Enabled = False - Me.cbxBrg_at_UNISPED.Location = New System.Drawing.Point(9, 210) + Me.cbxBrg_at_UNISPED.Location = New System.Drawing.Point(9, 142) Me.cbxBrg_at_UNISPED.Name = "cbxBrg_at_UNISPED" Me.cbxBrg_at_UNISPED.Size = New System.Drawing.Size(15, 14) Me.cbxBrg_at_UNISPED.TabIndex = 67 @@ -542,18 +628,18 @@ Partial Class frmMain ' Me.Label33lblBrg_at_UNISPED.AutoSize = True Me.Label33lblBrg_at_UNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label33lblBrg_at_UNISPED.Location = New System.Drawing.Point(24, 211) + Me.Label33lblBrg_at_UNISPED.Location = New System.Drawing.Point(24, 144) Me.Label33lblBrg_at_UNISPED.Name = "Label33lblBrg_at_UNISPED" - Me.Label33lblBrg_at_UNISPED.Size = New System.Drawing.Size(183, 13) + Me.Label33lblBrg_at_UNISPED.Size = New System.Drawing.Size(181, 13) Me.Label33lblBrg_at_UNISPED.TabIndex = 62 - Me.Label33lblBrg_at_UNISPED.Text = "AT - gVV - HZA Linz/Wels UNISPED" + Me.Label33lblBrg_at_UNISPED.Text = "DE - gVV - HZA München UNISPED" ' 'lblAtWocheUNISPED ' Me.lblAtWocheUNISPED.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAtWocheUNISPED.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAtWocheUNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAtWocheUNISPED.Location = New System.Drawing.Point(534, 210) + Me.lblAtWocheUNISPED.Location = New System.Drawing.Point(534, 143) Me.lblAtWocheUNISPED.Name = "lblAtWocheUNISPED" Me.lblAtWocheUNISPED.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAtWocheUNISPED.Size = New System.Drawing.Size(90, 13) @@ -565,7 +651,7 @@ Partial Class frmMain Me.lblAtTagUNISPED.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAtTagUNISPED.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAtTagUNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAtTagUNISPED.Location = New System.Drawing.Point(385, 211) + Me.lblAtTagUNISPED.Location = New System.Drawing.Point(385, 144) Me.lblAtTagUNISPED.Name = "lblAtTagUNISPED" Me.lblAtTagUNISPED.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAtTagUNISPED.Size = New System.Drawing.Size(90, 13) @@ -580,12 +666,13 @@ Partial Class frmMain Me.lblAt_woche_StatusUNISPED.Cursor = System.Windows.Forms.Cursors.Help Me.lblAt_woche_StatusUNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAt_woche_StatusUNISPED.ForeColor = System.Drawing.Color.White - Me.lblAt_woche_StatusUNISPED.Location = New System.Drawing.Point(630, 210) + Me.lblAt_woche_StatusUNISPED.Location = New System.Drawing.Point(630, 143) Me.lblAt_woche_StatusUNISPED.Name = "lblAt_woche_StatusUNISPED" Me.lblAt_woche_StatusUNISPED.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAt_woche_StatusUNISPED.Size = New System.Drawing.Size(22, 13) Me.lblAt_woche_StatusUNISPED.TabIndex = 65 Me.lblAt_woche_StatusUNISPED.Text = "OK" + Me.lblAt_woche_StatusUNISPED.Visible = False ' 'lblAt_tag_StatusUNISPED ' @@ -595,19 +682,20 @@ Partial Class frmMain Me.lblAt_tag_StatusUNISPED.Cursor = System.Windows.Forms.Cursors.Help Me.lblAt_tag_StatusUNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAt_tag_StatusUNISPED.ForeColor = System.Drawing.Color.White - Me.lblAt_tag_StatusUNISPED.Location = New System.Drawing.Point(483, 211) + Me.lblAt_tag_StatusUNISPED.Location = New System.Drawing.Point(483, 144) Me.lblAt_tag_StatusUNISPED.Name = "lblAt_tag_StatusUNISPED" Me.lblAt_tag_StatusUNISPED.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAt_tag_StatusUNISPED.Size = New System.Drawing.Size(22, 13) Me.lblAt_tag_StatusUNISPED.TabIndex = 66 Me.lblAt_tag_StatusUNISPED.Text = "OK" + Me.lblAt_tag_StatusUNISPED.Visible = False ' 'lblAufschubBrgEUST_de_UNISPED_oE ' Me.lblAufschubBrgEUST_de_UNISPED_oE.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrgEUST_de_UNISPED_oE.Cursor = System.Windows.Forms.Cursors.Default Me.lblAufschubBrgEUST_de_UNISPED_oE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrgEUST_de_UNISPED_oE.Location = New System.Drawing.Point(413, 398) + Me.lblAufschubBrgEUST_de_UNISPED_oE.Location = New System.Drawing.Point(413, 418) Me.lblAufschubBrgEUST_de_UNISPED_oE.Name = "lblAufschubBrgEUST_de_UNISPED_oE" Me.lblAufschubBrgEUST_de_UNISPED_oE.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrgEUST_de_UNISPED_oE.Size = New System.Drawing.Size(90, 13) @@ -618,7 +706,7 @@ Partial Class frmMain ' Me.cbxAufschubEUST_de_Unisped.AutoSize = True Me.cbxAufschubEUST_de_Unisped.Enabled = False - Me.cbxAufschubEUST_de_Unisped.Location = New System.Drawing.Point(9, 399) + Me.cbxAufschubEUST_de_Unisped.Location = New System.Drawing.Point(9, 419) Me.cbxAufschubEUST_de_Unisped.Name = "cbxAufschubEUST_de_Unisped" Me.cbxAufschubEUST_de_Unisped.Size = New System.Drawing.Size(15, 14) Me.cbxAufschubEUST_de_Unisped.TabIndex = 60 @@ -628,7 +716,7 @@ Partial Class frmMain ' Me.lblAufschubEUST_de_UNISPED.AutoSize = True Me.lblAufschubEUST_de_UNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubEUST_de_UNISPED.Location = New System.Drawing.Point(26, 399) + Me.lblAufschubEUST_de_UNISPED.Location = New System.Drawing.Point(26, 419) Me.lblAufschubEUST_de_UNISPED.Name = "lblAufschubEUST_de_UNISPED" Me.lblAufschubEUST_de_UNISPED.Size = New System.Drawing.Size(203, 13) Me.lblAufschubEUST_de_UNISPED.TabIndex = 56 @@ -639,7 +727,7 @@ Partial Class frmMain Me.lblAufschubBrgEUST_de_UNISPED.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrgEUST_de_UNISPED.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubBrgEUST_de_UNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrgEUST_de_UNISPED.Location = New System.Drawing.Point(534, 398) + Me.lblAufschubBrgEUST_de_UNISPED.Location = New System.Drawing.Point(534, 418) Me.lblAufschubBrgEUST_de_UNISPED.Name = "lblAufschubBrgEUST_de_UNISPED" Me.lblAufschubBrgEUST_de_UNISPED.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrgEUST_de_UNISPED.Size = New System.Drawing.Size(90, 13) @@ -654,7 +742,7 @@ Partial Class frmMain Me.lblAufschubStatusEUST_de_UNISPED.Cursor = System.Windows.Forms.Cursors.Help Me.lblAufschubStatusEUST_de_UNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAufschubStatusEUST_de_UNISPED.ForeColor = System.Drawing.Color.White - Me.lblAufschubStatusEUST_de_UNISPED.Location = New System.Drawing.Point(630, 398) + Me.lblAufschubStatusEUST_de_UNISPED.Location = New System.Drawing.Point(630, 418) Me.lblAufschubStatusEUST_de_UNISPED.Name = "lblAufschubStatusEUST_de_UNISPED" Me.lblAufschubStatusEUST_de_UNISPED.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubStatusEUST_de_UNISPED.Size = New System.Drawing.Size(22, 13) @@ -666,7 +754,7 @@ Partial Class frmMain Me.lblAufschubBrg_de_UNISPED_oE.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrg_de_UNISPED_oE.Cursor = System.Windows.Forms.Cursors.Default Me.lblAufschubBrg_de_UNISPED_oE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrg_de_UNISPED_oE.Location = New System.Drawing.Point(413, 380) + Me.lblAufschubBrg_de_UNISPED_oE.Location = New System.Drawing.Point(413, 400) Me.lblAufschubBrg_de_UNISPED_oE.Name = "lblAufschubBrg_de_UNISPED_oE" Me.lblAufschubBrg_de_UNISPED_oE.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrg_de_UNISPED_oE.Size = New System.Drawing.Size(90, 13) @@ -677,7 +765,7 @@ Partial Class frmMain ' Me.cbxAufschub_de_Unisped.AutoSize = True Me.cbxAufschub_de_Unisped.Enabled = False - Me.cbxAufschub_de_Unisped.Location = New System.Drawing.Point(9, 381) + Me.cbxAufschub_de_Unisped.Location = New System.Drawing.Point(9, 401) Me.cbxAufschub_de_Unisped.Name = "cbxAufschub_de_Unisped" Me.cbxAufschub_de_Unisped.Size = New System.Drawing.Size(15, 14) Me.cbxAufschub_de_Unisped.TabIndex = 54 @@ -687,7 +775,7 @@ Partial Class frmMain ' Me.lblAufschub_de_UNISPED.AutoSize = True Me.lblAufschub_de_UNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschub_de_UNISPED.Location = New System.Drawing.Point(26, 381) + Me.lblAufschub_de_UNISPED.Location = New System.Drawing.Point(26, 401) Me.lblAufschub_de_UNISPED.Name = "lblAufschub_de_UNISPED" Me.lblAufschub_de_UNISPED.Size = New System.Drawing.Size(201, 13) Me.lblAufschub_de_UNISPED.TabIndex = 50 @@ -698,7 +786,7 @@ Partial Class frmMain Me.lblAufschubBrg_de_UNISPED.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrg_de_UNISPED.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubBrg_de_UNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrg_de_UNISPED.Location = New System.Drawing.Point(534, 380) + Me.lblAufschubBrg_de_UNISPED.Location = New System.Drawing.Point(534, 400) Me.lblAufschubBrg_de_UNISPED.Name = "lblAufschubBrg_de_UNISPED" Me.lblAufschubBrg_de_UNISPED.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrg_de_UNISPED.Size = New System.Drawing.Size(90, 13) @@ -713,7 +801,7 @@ Partial Class frmMain Me.lblAufschubStatus_de_UNISPED.Cursor = System.Windows.Forms.Cursors.Help Me.lblAufschubStatus_de_UNISPED.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAufschubStatus_de_UNISPED.ForeColor = System.Drawing.Color.White - Me.lblAufschubStatus_de_UNISPED.Location = New System.Drawing.Point(630, 380) + Me.lblAufschubStatus_de_UNISPED.Location = New System.Drawing.Point(630, 400) Me.lblAufschubStatus_de_UNISPED.Name = "lblAufschubStatus_de_UNISPED" Me.lblAufschubStatus_de_UNISPED.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubStatus_de_UNISPED.Size = New System.Drawing.Size(22, 13) @@ -725,7 +813,7 @@ Partial Class frmMain Me.lblAufschubBrgEUST_de_VeragAG_oE.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrgEUST_de_VeragAG_oE.Cursor = System.Windows.Forms.Cursors.Default Me.lblAufschubBrgEUST_de_VeragAG_oE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrgEUST_de_VeragAG_oE.Location = New System.Drawing.Point(413, 286) + Me.lblAufschubBrgEUST_de_VeragAG_oE.Location = New System.Drawing.Point(413, 306) Me.lblAufschubBrgEUST_de_VeragAG_oE.Name = "lblAufschubBrgEUST_de_VeragAG_oE" Me.lblAufschubBrgEUST_de_VeragAG_oE.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrgEUST_de_VeragAG_oE.Size = New System.Drawing.Size(90, 13) @@ -736,7 +824,7 @@ Partial Class frmMain ' Me.cbxAufschubEUST_de_VeragAG.AutoSize = True Me.cbxAufschubEUST_de_VeragAG.Enabled = False - Me.cbxAufschubEUST_de_VeragAG.Location = New System.Drawing.Point(9, 287) + Me.cbxAufschubEUST_de_VeragAG.Location = New System.Drawing.Point(9, 307) Me.cbxAufschubEUST_de_VeragAG.Name = "cbxAufschubEUST_de_VeragAG" Me.cbxAufschubEUST_de_VeragAG.Size = New System.Drawing.Size(15, 14) Me.cbxAufschubEUST_de_VeragAG.TabIndex = 48 @@ -746,7 +834,7 @@ Partial Class frmMain ' Me.lblAufschubEUST_de_VeragAG.AutoSize = True Me.lblAufschubEUST_de_VeragAG.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubEUST_de_VeragAG.Location = New System.Drawing.Point(26, 287) + Me.lblAufschubEUST_de_VeragAG.Location = New System.Drawing.Point(26, 307) Me.lblAufschubEUST_de_VeragAG.Name = "lblAufschubEUST_de_VeragAG" Me.lblAufschubEUST_de_VeragAG.Size = New System.Drawing.Size(257, 13) Me.lblAufschubEUST_de_VeragAG.TabIndex = 44 @@ -757,7 +845,7 @@ Partial Class frmMain Me.lblAufschubBrgEUST_de_VeragAG.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrgEUST_de_VeragAG.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubBrgEUST_de_VeragAG.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrgEUST_de_VeragAG.Location = New System.Drawing.Point(534, 286) + Me.lblAufschubBrgEUST_de_VeragAG.Location = New System.Drawing.Point(534, 306) Me.lblAufschubBrgEUST_de_VeragAG.Name = "lblAufschubBrgEUST_de_VeragAG" Me.lblAufschubBrgEUST_de_VeragAG.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrgEUST_de_VeragAG.Size = New System.Drawing.Size(90, 13) @@ -772,7 +860,7 @@ Partial Class frmMain Me.lblAufschubStatusEUST_de_VeragAG.Cursor = System.Windows.Forms.Cursors.Help Me.lblAufschubStatusEUST_de_VeragAG.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAufschubStatusEUST_de_VeragAG.ForeColor = System.Drawing.Color.White - Me.lblAufschubStatusEUST_de_VeragAG.Location = New System.Drawing.Point(630, 286) + Me.lblAufschubStatusEUST_de_VeragAG.Location = New System.Drawing.Point(630, 306) Me.lblAufschubStatusEUST_de_VeragAG.Name = "lblAufschubStatusEUST_de_VeragAG" Me.lblAufschubStatusEUST_de_VeragAG.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubStatusEUST_de_VeragAG.Size = New System.Drawing.Size(22, 13) @@ -784,7 +872,7 @@ Partial Class frmMain Me.lblAufschubBrgEUST_de_Imex_oE.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrgEUST_de_Imex_oE.Cursor = System.Windows.Forms.Cursors.Default Me.lblAufschubBrgEUST_de_Imex_oE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrgEUST_de_Imex_oE.Location = New System.Drawing.Point(413, 331) + Me.lblAufschubBrgEUST_de_Imex_oE.Location = New System.Drawing.Point(413, 351) Me.lblAufschubBrgEUST_de_Imex_oE.Name = "lblAufschubBrgEUST_de_Imex_oE" Me.lblAufschubBrgEUST_de_Imex_oE.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrgEUST_de_Imex_oE.Size = New System.Drawing.Size(90, 13) @@ -795,7 +883,7 @@ Partial Class frmMain ' Me.cbxAufschubEUST_de_Imex.AutoSize = True Me.cbxAufschubEUST_de_Imex.Enabled = False - Me.cbxAufschubEUST_de_Imex.Location = New System.Drawing.Point(9, 332) + Me.cbxAufschubEUST_de_Imex.Location = New System.Drawing.Point(9, 352) Me.cbxAufschubEUST_de_Imex.Name = "cbxAufschubEUST_de_Imex" Me.cbxAufschubEUST_de_Imex.Size = New System.Drawing.Size(15, 14) Me.cbxAufschubEUST_de_Imex.TabIndex = 42 @@ -805,7 +893,7 @@ Partial Class frmMain ' Me.lblAufschubEUST_de_Imex.AutoSize = True Me.lblAufschubEUST_de_Imex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubEUST_de_Imex.Location = New System.Drawing.Point(26, 332) + Me.lblAufschubEUST_de_Imex.Location = New System.Drawing.Point(26, 352) Me.lblAufschubEUST_de_Imex.Name = "lblAufschubEUST_de_Imex" Me.lblAufschubEUST_de_Imex.Size = New System.Drawing.Size(181, 13) Me.lblAufschubEUST_de_Imex.TabIndex = 38 @@ -816,7 +904,7 @@ Partial Class frmMain Me.lblAufschubBrgEUST_de_Imex.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrgEUST_de_Imex.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubBrgEUST_de_Imex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrgEUST_de_Imex.Location = New System.Drawing.Point(534, 331) + Me.lblAufschubBrgEUST_de_Imex.Location = New System.Drawing.Point(534, 351) Me.lblAufschubBrgEUST_de_Imex.Name = "lblAufschubBrgEUST_de_Imex" Me.lblAufschubBrgEUST_de_Imex.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrgEUST_de_Imex.Size = New System.Drawing.Size(90, 13) @@ -831,7 +919,7 @@ Partial Class frmMain Me.lblAufschubStatusEUST_de_Imex.Cursor = System.Windows.Forms.Cursors.Help Me.lblAufschubStatusEUST_de_Imex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAufschubStatusEUST_de_Imex.ForeColor = System.Drawing.Color.White - Me.lblAufschubStatusEUST_de_Imex.Location = New System.Drawing.Point(630, 331) + Me.lblAufschubStatusEUST_de_Imex.Location = New System.Drawing.Point(630, 351) Me.lblAufschubStatusEUST_de_Imex.Name = "lblAufschubStatusEUST_de_Imex" Me.lblAufschubStatusEUST_de_Imex.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubStatusEUST_de_Imex.Size = New System.Drawing.Size(22, 13) @@ -842,7 +930,7 @@ Partial Class frmMain ' Me.cbxBrg_at_Atilla.AutoSize = True Me.cbxBrg_at_Atilla.Enabled = False - Me.cbxBrg_at_Atilla.Location = New System.Drawing.Point(9, 188) + Me.cbxBrg_at_Atilla.Location = New System.Drawing.Point(9, 209) Me.cbxBrg_at_Atilla.Name = "cbxBrg_at_Atilla" Me.cbxBrg_at_Atilla.Size = New System.Drawing.Size(15, 14) Me.cbxBrg_at_Atilla.TabIndex = 37 @@ -852,7 +940,7 @@ Partial Class frmMain ' Me.lblBrg_at_Atilla.AutoSize = True Me.lblBrg_at_Atilla.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblBrg_at_Atilla.Location = New System.Drawing.Point(24, 189) + Me.lblBrg_at_Atilla.Location = New System.Drawing.Point(24, 210) Me.lblBrg_at_Atilla.Name = "lblBrg_at_Atilla" Me.lblBrg_at_Atilla.Size = New System.Drawing.Size(171, 13) Me.lblBrg_at_Atilla.TabIndex = 32 @@ -863,7 +951,7 @@ Partial Class frmMain Me.lblAtWocheAtilla.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAtWocheAtilla.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAtWocheAtilla.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAtWocheAtilla.Location = New System.Drawing.Point(534, 188) + Me.lblAtWocheAtilla.Location = New System.Drawing.Point(534, 209) Me.lblAtWocheAtilla.Name = "lblAtWocheAtilla" Me.lblAtWocheAtilla.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAtWocheAtilla.Size = New System.Drawing.Size(90, 13) @@ -875,7 +963,7 @@ Partial Class frmMain Me.lblAtTagAtilla.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAtTagAtilla.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAtTagAtilla.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAtTagAtilla.Location = New System.Drawing.Point(385, 189) + Me.lblAtTagAtilla.Location = New System.Drawing.Point(385, 210) Me.lblAtTagAtilla.Name = "lblAtTagAtilla" Me.lblAtTagAtilla.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAtTagAtilla.Size = New System.Drawing.Size(90, 13) @@ -890,7 +978,7 @@ Partial Class frmMain Me.lblAt_woche_StatusAtilla.Cursor = System.Windows.Forms.Cursors.Help Me.lblAt_woche_StatusAtilla.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAt_woche_StatusAtilla.ForeColor = System.Drawing.Color.White - Me.lblAt_woche_StatusAtilla.Location = New System.Drawing.Point(630, 188) + Me.lblAt_woche_StatusAtilla.Location = New System.Drawing.Point(630, 209) Me.lblAt_woche_StatusAtilla.Name = "lblAt_woche_StatusAtilla" Me.lblAt_woche_StatusAtilla.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAt_woche_StatusAtilla.Size = New System.Drawing.Size(22, 13) @@ -905,7 +993,7 @@ Partial Class frmMain Me.lblAt_tag_StatusAtilla.Cursor = System.Windows.Forms.Cursors.Help Me.lblAt_tag_StatusAtilla.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAt_tag_StatusAtilla.ForeColor = System.Drawing.Color.White - Me.lblAt_tag_StatusAtilla.Location = New System.Drawing.Point(483, 189) + Me.lblAt_tag_StatusAtilla.Location = New System.Drawing.Point(483, 210) Me.lblAt_tag_StatusAtilla.Name = "lblAt_tag_StatusAtilla" Me.lblAt_tag_StatusAtilla.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAt_tag_StatusAtilla.Size = New System.Drawing.Size(22, 13) @@ -916,7 +1004,7 @@ Partial Class frmMain ' Me.cbxBrg_at_Imex.AutoSize = True Me.cbxBrg_at_Imex.Enabled = False - Me.cbxBrg_at_Imex.Location = New System.Drawing.Point(9, 165) + Me.cbxBrg_at_Imex.Location = New System.Drawing.Point(9, 186) Me.cbxBrg_at_Imex.Name = "cbxBrg_at_Imex" Me.cbxBrg_at_Imex.Size = New System.Drawing.Size(15, 14) Me.cbxBrg_at_Imex.TabIndex = 31 @@ -926,7 +1014,7 @@ Partial Class frmMain ' Me.lblBrg_at_Imex.AutoSize = True Me.lblBrg_at_Imex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblBrg_at_Imex.Location = New System.Drawing.Point(24, 166) + Me.lblBrg_at_Imex.Location = New System.Drawing.Point(24, 187) Me.lblBrg_at_Imex.Name = "lblBrg_at_Imex" Me.lblBrg_at_Imex.Size = New System.Drawing.Size(161, 13) Me.lblBrg_at_Imex.TabIndex = 26 @@ -937,7 +1025,7 @@ Partial Class frmMain Me.lblAtWocheImex.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAtWocheImex.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAtWocheImex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAtWocheImex.Location = New System.Drawing.Point(534, 165) + Me.lblAtWocheImex.Location = New System.Drawing.Point(534, 186) Me.lblAtWocheImex.Name = "lblAtWocheImex" Me.lblAtWocheImex.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAtWocheImex.Size = New System.Drawing.Size(90, 13) @@ -949,7 +1037,7 @@ Partial Class frmMain Me.lblAtTagImex.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAtTagImex.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAtTagImex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAtTagImex.Location = New System.Drawing.Point(385, 166) + Me.lblAtTagImex.Location = New System.Drawing.Point(385, 187) Me.lblAtTagImex.Name = "lblAtTagImex" Me.lblAtTagImex.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAtTagImex.Size = New System.Drawing.Size(90, 13) @@ -964,7 +1052,7 @@ Partial Class frmMain Me.lblAt_woche_StatusImex.Cursor = System.Windows.Forms.Cursors.Help Me.lblAt_woche_StatusImex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAt_woche_StatusImex.ForeColor = System.Drawing.Color.White - Me.lblAt_woche_StatusImex.Location = New System.Drawing.Point(630, 165) + Me.lblAt_woche_StatusImex.Location = New System.Drawing.Point(630, 186) Me.lblAt_woche_StatusImex.Name = "lblAt_woche_StatusImex" Me.lblAt_woche_StatusImex.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAt_woche_StatusImex.Size = New System.Drawing.Size(22, 13) @@ -979,7 +1067,7 @@ Partial Class frmMain Me.lblAt_tag_StatusImex.Cursor = System.Windows.Forms.Cursors.Help Me.lblAt_tag_StatusImex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAt_tag_StatusImex.ForeColor = System.Drawing.Color.White - Me.lblAt_tag_StatusImex.Location = New System.Drawing.Point(483, 166) + Me.lblAt_tag_StatusImex.Location = New System.Drawing.Point(483, 187) Me.lblAt_tag_StatusImex.Name = "lblAt_tag_StatusImex" Me.lblAt_tag_StatusImex.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAt_tag_StatusImex.Size = New System.Drawing.Size(22, 13) @@ -991,7 +1079,7 @@ Partial Class frmMain Me.Label3.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(528, 468) + Me.Label3.Location = New System.Drawing.Point(528, 488) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(128, 13) Me.Label3.TabIndex = 25 @@ -1002,7 +1090,7 @@ Partial Class frmMain Me.lblAufschubBrg_de_Imex_oE.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrg_de_Imex_oE.Cursor = System.Windows.Forms.Cursors.Default Me.lblAufschubBrg_de_Imex_oE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrg_de_Imex_oE.Location = New System.Drawing.Point(413, 313) + Me.lblAufschubBrg_de_Imex_oE.Location = New System.Drawing.Point(413, 333) Me.lblAufschubBrg_de_Imex_oE.Name = "lblAufschubBrg_de_Imex_oE" Me.lblAufschubBrg_de_Imex_oE.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrg_de_Imex_oE.Size = New System.Drawing.Size(90, 13) @@ -1014,7 +1102,7 @@ Partial Class frmMain Me.lblAufschubBrg_at_VeragZS_oE.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrg_at_VeragZS_oE.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubBrg_at_VeragZS_oE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrg_at_VeragZS_oE.Location = New System.Drawing.Point(413, 525) + Me.lblAufschubBrg_at_VeragZS_oE.Location = New System.Drawing.Point(413, 545) Me.lblAufschubBrg_at_VeragZS_oE.Name = "lblAufschubBrg_at_VeragZS_oE" Me.lblAufschubBrg_at_VeragZS_oE.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrg_at_VeragZS_oE.Size = New System.Drawing.Size(90, 13) @@ -1027,7 +1115,7 @@ Partial Class frmMain Me.lblAufschubBrg_at_VeragCS_oE.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrg_at_VeragCS_oE.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubBrg_at_VeragCS_oE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrg_at_VeragCS_oE.Location = New System.Drawing.Point(413, 505) + Me.lblAufschubBrg_at_VeragCS_oE.Location = New System.Drawing.Point(413, 525) Me.lblAufschubBrg_at_VeragCS_oE.Name = "lblAufschubBrg_at_VeragCS_oE" Me.lblAufschubBrg_at_VeragCS_oE.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrg_at_VeragCS_oE.Size = New System.Drawing.Size(90, 13) @@ -1040,7 +1128,7 @@ Partial Class frmMain Me.lblAufschubBrg_de_VeragAG_oE.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrg_de_VeragAG_oE.Cursor = System.Windows.Forms.Cursors.Default Me.lblAufschubBrg_de_VeragAG_oE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrg_de_VeragAG_oE.Location = New System.Drawing.Point(413, 268) + Me.lblAufschubBrg_de_VeragAG_oE.Location = New System.Drawing.Point(413, 288) Me.lblAufschubBrg_de_VeragAG_oE.Name = "lblAufschubBrg_de_VeragAG_oE" Me.lblAufschubBrg_de_VeragAG_oE.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrg_de_VeragAG_oE.Size = New System.Drawing.Size(90, 13) @@ -1052,7 +1140,7 @@ Partial Class frmMain Me.lblAufschubBrg_at_VeragAG_oE.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrg_at_VeragAG_oE.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubBrg_at_VeragAG_oE.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrg_at_VeragAG_oE.Location = New System.Drawing.Point(413, 485) + Me.lblAufschubBrg_at_VeragAG_oE.Location = New System.Drawing.Point(413, 505) Me.lblAufschubBrg_at_VeragAG_oE.Name = "lblAufschubBrg_at_VeragAG_oE" Me.lblAufschubBrg_at_VeragAG_oE.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrg_at_VeragAG_oE.Size = New System.Drawing.Size(90, 13) @@ -1064,7 +1152,7 @@ Partial Class frmMain ' Me.cbxAufschub_de_Imex.AutoSize = True Me.cbxAufschub_de_Imex.Enabled = False - Me.cbxAufschub_de_Imex.Location = New System.Drawing.Point(9, 314) + Me.cbxAufschub_de_Imex.Location = New System.Drawing.Point(9, 334) Me.cbxAufschub_de_Imex.Name = "cbxAufschub_de_Imex" Me.cbxAufschub_de_Imex.Size = New System.Drawing.Size(15, 14) Me.cbxAufschub_de_Imex.TabIndex = 19 @@ -1074,7 +1162,7 @@ Partial Class frmMain ' Me.lblAufschub_de_Imex.AutoSize = True Me.lblAufschub_de_Imex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschub_de_Imex.Location = New System.Drawing.Point(26, 314) + Me.lblAufschub_de_Imex.Location = New System.Drawing.Point(26, 334) Me.lblAufschub_de_Imex.Name = "lblAufschub_de_Imex" Me.lblAufschub_de_Imex.Size = New System.Drawing.Size(179, 13) Me.lblAufschub_de_Imex.TabIndex = 15 @@ -1085,7 +1173,7 @@ Partial Class frmMain Me.lblAufschubBrg_de_Imex.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrg_de_Imex.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubBrg_de_Imex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrg_de_Imex.Location = New System.Drawing.Point(534, 313) + Me.lblAufschubBrg_de_Imex.Location = New System.Drawing.Point(534, 333) Me.lblAufschubBrg_de_Imex.Name = "lblAufschubBrg_de_Imex" Me.lblAufschubBrg_de_Imex.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrg_de_Imex.Size = New System.Drawing.Size(90, 13) @@ -1097,7 +1185,7 @@ Partial Class frmMain Me.lblAufschubAkt_de_Imex.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubAkt_de_Imex.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubAkt_de_Imex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubAkt_de_Imex.Location = New System.Drawing.Point(293, 320) + Me.lblAufschubAkt_de_Imex.Location = New System.Drawing.Point(293, 340) Me.lblAufschubAkt_de_Imex.Name = "lblAufschubAkt_de_Imex" Me.lblAufschubAkt_de_Imex.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubAkt_de_Imex.Size = New System.Drawing.Size(90, 13) @@ -1113,7 +1201,7 @@ Partial Class frmMain Me.lblAufschubStatus_de_Imex.Cursor = System.Windows.Forms.Cursors.Help Me.lblAufschubStatus_de_Imex.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAufschubStatus_de_Imex.ForeColor = System.Drawing.Color.White - Me.lblAufschubStatus_de_Imex.Location = New System.Drawing.Point(630, 313) + Me.lblAufschubStatus_de_Imex.Location = New System.Drawing.Point(630, 333) Me.lblAufschubStatus_de_Imex.Name = "lblAufschubStatus_de_Imex" Me.lblAufschubStatus_de_Imex.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubStatus_de_Imex.Size = New System.Drawing.Size(22, 13) @@ -1208,7 +1296,7 @@ Partial Class frmMain 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(5, 579) + Me.Label2.Location = New System.Drawing.Point(5, 599) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(177, 13) Me.Label2.TabIndex = 5 @@ -1219,7 +1307,7 @@ Partial Class frmMain ' Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.Button4.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Button4.Location = New System.Drawing.Point(182, 574) + Me.Button4.Location = New System.Drawing.Point(182, 594) Me.Button4.Name = "Button4" Me.Button4.Size = New System.Drawing.Size(62, 23) Me.Button4.TabIndex = 4 @@ -1231,7 +1319,7 @@ Partial Class frmMain ' Me.cbxAufschub_at_VeragZS.AutoSize = True Me.cbxAufschub_at_VeragZS.Enabled = False - Me.cbxAufschub_at_VeragZS.Location = New System.Drawing.Point(9, 526) + Me.cbxAufschub_at_VeragZS.Location = New System.Drawing.Point(9, 546) Me.cbxAufschub_at_VeragZS.Name = "cbxAufschub_at_VeragZS" Me.cbxAufschub_at_VeragZS.Size = New System.Drawing.Size(15, 14) Me.cbxAufschub_at_VeragZS.TabIndex = 3 @@ -1344,7 +1432,7 @@ Partial Class frmMain ' Me.cbxAufschub_at_VeragCS.AutoSize = True Me.cbxAufschub_at_VeragCS.Enabled = False - Me.cbxAufschub_at_VeragCS.Location = New System.Drawing.Point(9, 506) + Me.cbxAufschub_at_VeragCS.Location = New System.Drawing.Point(9, 526) Me.cbxAufschub_at_VeragCS.Name = "cbxAufschub_at_VeragCS" Me.cbxAufschub_at_VeragCS.Size = New System.Drawing.Size(15, 14) Me.cbxAufschub_at_VeragCS.TabIndex = 3 @@ -1364,7 +1452,7 @@ Partial Class frmMain ' Me.cbxAufschub_at_VeragAG.AutoSize = True Me.cbxAufschub_at_VeragAG.Enabled = False - Me.cbxAufschub_at_VeragAG.Location = New System.Drawing.Point(9, 486) + Me.cbxAufschub_at_VeragAG.Location = New System.Drawing.Point(9, 506) Me.cbxAufschub_at_VeragAG.Name = "cbxAufschub_at_VeragAG" Me.cbxAufschub_at_VeragAG.Size = New System.Drawing.Size(15, 14) Me.cbxAufschub_at_VeragAG.TabIndex = 3 @@ -1374,7 +1462,7 @@ Partial Class frmMain ' Me.cbxAufschub_de_VeragAG.AutoSize = True Me.cbxAufschub_de_VeragAG.Enabled = False - Me.cbxAufschub_de_VeragAG.Location = New System.Drawing.Point(9, 269) + Me.cbxAufschub_de_VeragAG.Location = New System.Drawing.Point(9, 289) Me.cbxAufschub_de_VeragAG.Name = "cbxAufschub_de_VeragAG" Me.cbxAufschub_de_VeragAG.Size = New System.Drawing.Size(15, 14) Me.cbxAufschub_de_VeragAG.TabIndex = 3 @@ -1384,7 +1472,7 @@ Partial Class frmMain ' Me.Label5.AutoSize = True Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label5.Location = New System.Drawing.Point(207, 239) + Me.Label5.Location = New System.Drawing.Point(207, 259) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(76, 13) Me.Label5.TabIndex = 1 @@ -1395,7 +1483,7 @@ Partial Class frmMain ' Me.cbxBrg_at_VeragAG.AutoSize = True Me.cbxBrg_at_VeragAG.Enabled = False - Me.cbxBrg_at_VeragAG.Location = New System.Drawing.Point(9, 143) + Me.cbxBrg_at_VeragAG.Location = New System.Drawing.Point(9, 164) Me.cbxBrg_at_VeragAG.Name = "cbxBrg_at_VeragAG" Me.cbxBrg_at_VeragAG.Size = New System.Drawing.Size(15, 14) Me.cbxBrg_at_VeragAG.TabIndex = 3 @@ -1405,7 +1493,7 @@ Partial Class frmMain ' Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Location = New System.Drawing.Point(552, 574) + Me.Button1.Location = New System.Drawing.Point(552, 594) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(103, 23) Me.Button1.TabIndex = 0 @@ -1416,7 +1504,7 @@ Partial Class frmMain ' Me.Label7.AutoSize = True Me.Label7.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label7.Location = New System.Drawing.Point(6, 239) + Me.Label7.Location = New System.Drawing.Point(6, 259) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(189, 13) Me.Label7.TabIndex = 1 @@ -1430,7 +1518,7 @@ Partial Class frmMain Me.lblAufschubStatus_at_VeragZS.Cursor = System.Windows.Forms.Cursors.Help Me.lblAufschubStatus_at_VeragZS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAufschubStatus_at_VeragZS.ForeColor = System.Drawing.Color.White - Me.lblAufschubStatus_at_VeragZS.Location = New System.Drawing.Point(630, 525) + Me.lblAufschubStatus_at_VeragZS.Location = New System.Drawing.Point(630, 545) Me.lblAufschubStatus_at_VeragZS.Name = "lblAufschubStatus_at_VeragZS" Me.lblAufschubStatus_at_VeragZS.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubStatus_at_VeragZS.Size = New System.Drawing.Size(22, 13) @@ -1445,7 +1533,7 @@ Partial Class frmMain Me.lblAufschubStatus_at_VeragCS.Cursor = System.Windows.Forms.Cursors.Help Me.lblAufschubStatus_at_VeragCS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAufschubStatus_at_VeragCS.ForeColor = System.Drawing.Color.White - Me.lblAufschubStatus_at_VeragCS.Location = New System.Drawing.Point(630, 505) + Me.lblAufschubStatus_at_VeragCS.Location = New System.Drawing.Point(630, 525) Me.lblAufschubStatus_at_VeragCS.Name = "lblAufschubStatus_at_VeragCS" Me.lblAufschubStatus_at_VeragCS.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubStatus_at_VeragCS.Size = New System.Drawing.Size(22, 13) @@ -1457,7 +1545,7 @@ Partial Class frmMain Me.lblAufschubAkt_at_VeragZS.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubAkt_at_VeragZS.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubAkt_at_VeragZS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubAkt_at_VeragZS.Location = New System.Drawing.Point(293, 526) + Me.lblAufschubAkt_at_VeragZS.Location = New System.Drawing.Point(293, 546) Me.lblAufschubAkt_at_VeragZS.Name = "lblAufschubAkt_at_VeragZS" Me.lblAufschubAkt_at_VeragZS.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubAkt_at_VeragZS.Size = New System.Drawing.Size(90, 13) @@ -1469,7 +1557,7 @@ Partial Class frmMain ' Me.lblBrg_at_VeragAG.AutoSize = True Me.lblBrg_at_VeragAG.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblBrg_at_VeragAG.Location = New System.Drawing.Point(24, 144) + Me.lblBrg_at_VeragAG.Location = New System.Drawing.Point(24, 165) Me.lblBrg_at_VeragAG.Name = "lblBrg_at_VeragAG" Me.lblBrg_at_VeragAG.Size = New System.Drawing.Size(132, 13) Me.lblBrg_at_VeragAG.TabIndex = 1 @@ -1480,7 +1568,7 @@ Partial Class frmMain Me.lblAufschubBrg_at_VeragZS.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrg_at_VeragZS.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubBrg_at_VeragZS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrg_at_VeragZS.Location = New System.Drawing.Point(534, 525) + Me.lblAufschubBrg_at_VeragZS.Location = New System.Drawing.Point(534, 545) Me.lblAufschubBrg_at_VeragZS.Name = "lblAufschubBrg_at_VeragZS" Me.lblAufschubBrg_at_VeragZS.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrg_at_VeragZS.Size = New System.Drawing.Size(90, 13) @@ -1492,7 +1580,7 @@ Partial Class frmMain Me.lblAufschubAkt_at_VeragCS.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubAkt_at_VeragCS.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubAkt_at_VeragCS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubAkt_at_VeragCS.Location = New System.Drawing.Point(293, 506) + Me.lblAufschubAkt_at_VeragCS.Location = New System.Drawing.Point(293, 526) Me.lblAufschubAkt_at_VeragCS.Name = "lblAufschubAkt_at_VeragCS" Me.lblAufschubAkt_at_VeragCS.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubAkt_at_VeragCS.Size = New System.Drawing.Size(90, 13) @@ -1505,7 +1593,7 @@ Partial Class frmMain Me.lblAtWoche.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAtWoche.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAtWoche.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAtWoche.Location = New System.Drawing.Point(534, 143) + Me.lblAtWoche.Location = New System.Drawing.Point(534, 164) Me.lblAtWoche.Name = "lblAtWoche" Me.lblAtWoche.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAtWoche.Size = New System.Drawing.Size(90, 13) @@ -1517,7 +1605,7 @@ Partial Class frmMain Me.lblAufschubBrg_at_VeragCS.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrg_at_VeragCS.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubBrg_at_VeragCS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrg_at_VeragCS.Location = New System.Drawing.Point(534, 505) + Me.lblAufschubBrg_at_VeragCS.Location = New System.Drawing.Point(534, 525) Me.lblAufschubBrg_at_VeragCS.Name = "lblAufschubBrg_at_VeragCS" Me.lblAufschubBrg_at_VeragCS.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrg_at_VeragCS.Size = New System.Drawing.Size(90, 13) @@ -1529,7 +1617,7 @@ Partial Class frmMain Me.lblAtTag.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAtTag.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAtTag.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAtTag.Location = New System.Drawing.Point(385, 144) + Me.lblAtTag.Location = New System.Drawing.Point(385, 165) Me.lblAtTag.Name = "lblAtTag" Me.lblAtTag.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAtTag.Size = New System.Drawing.Size(90, 13) @@ -1540,7 +1628,7 @@ Partial Class frmMain ' Me.lblAufschub_at_VeragZS.AutoSize = True Me.lblAufschub_at_VeragZS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschub_at_VeragZS.Location = New System.Drawing.Point(26, 526) + Me.lblAufschub_at_VeragZS.Location = New System.Drawing.Point(26, 546) Me.lblAufschub_at_VeragZS.Name = "lblAufschub_at_VeragZS" Me.lblAufschub_at_VeragZS.Size = New System.Drawing.Size(236, 13) Me.lblAufschub_at_VeragZS.TabIndex = 1 @@ -1554,7 +1642,7 @@ Partial Class frmMain Me.lblAt_woche_Status.Cursor = System.Windows.Forms.Cursors.Help Me.lblAt_woche_Status.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAt_woche_Status.ForeColor = System.Drawing.Color.White - Me.lblAt_woche_Status.Location = New System.Drawing.Point(630, 143) + Me.lblAt_woche_Status.Location = New System.Drawing.Point(630, 164) Me.lblAt_woche_Status.Name = "lblAt_woche_Status" Me.lblAt_woche_Status.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAt_woche_Status.Size = New System.Drawing.Size(22, 13) @@ -1565,7 +1653,7 @@ Partial Class frmMain ' Me.lblAufschub_at_VeragCS.AutoSize = True Me.lblAufschub_at_VeragCS.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschub_at_VeragCS.Location = New System.Drawing.Point(26, 506) + Me.lblAufschub_at_VeragCS.Location = New System.Drawing.Point(26, 526) Me.lblAufschub_at_VeragCS.Name = "lblAufschub_at_VeragCS" Me.lblAufschub_at_VeragCS.Size = New System.Drawing.Size(235, 13) Me.lblAufschub_at_VeragCS.TabIndex = 1 @@ -1575,7 +1663,7 @@ Partial Class frmMain ' Me.lblAufschub_de_VeragAG.AutoSize = True Me.lblAufschub_de_VeragAG.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschub_de_VeragAG.Location = New System.Drawing.Point(26, 269) + Me.lblAufschub_de_VeragAG.Location = New System.Drawing.Point(26, 289) Me.lblAufschub_de_VeragAG.Name = "lblAufschub_de_VeragAG" Me.lblAufschub_de_VeragAG.Size = New System.Drawing.Size(255, 13) Me.lblAufschub_de_VeragAG.TabIndex = 1 @@ -1600,7 +1688,7 @@ Partial Class frmMain Me.lblAt_tag_Status.Cursor = System.Windows.Forms.Cursors.Help Me.lblAt_tag_Status.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAt_tag_Status.ForeColor = System.Drawing.Color.White - Me.lblAt_tag_Status.Location = New System.Drawing.Point(483, 144) + Me.lblAt_tag_Status.Location = New System.Drawing.Point(483, 165) Me.lblAt_tag_Status.Name = "lblAt_tag_Status" Me.lblAt_tag_Status.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAt_tag_Status.Size = New System.Drawing.Size(22, 13) @@ -1612,7 +1700,7 @@ Partial Class frmMain Me.Label8.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label8.AutoSize = True Me.Label8.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label8.Location = New System.Drawing.Point(386, 239) + Me.Label8.Location = New System.Drawing.Point(386, 259) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(116, 13) Me.Label8.TabIndex = 1 @@ -1622,7 +1710,7 @@ Partial Class frmMain ' Me.lblAufschub_at_VeragAG.AutoSize = True Me.lblAufschub_at_VeragAG.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschub_at_VeragAG.Location = New System.Drawing.Point(26, 486) + Me.lblAufschub_at_VeragAG.Location = New System.Drawing.Point(26, 506) Me.lblAufschub_at_VeragAG.Name = "lblAufschub_at_VeragAG" Me.lblAufschub_at_VeragAG.Size = New System.Drawing.Size(214, 13) Me.lblAufschub_at_VeragAG.TabIndex = 1 @@ -1633,7 +1721,7 @@ Partial Class frmMain Me.Label34.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label34.AutoSize = True Me.Label34.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label34.Location = New System.Drawing.Point(540, 239) + Me.Label34.Location = New System.Drawing.Point(540, 259) Me.Label34.Name = "Label34" Me.Label34.Size = New System.Drawing.Size(116, 13) Me.Label34.TabIndex = 1 @@ -1644,7 +1732,7 @@ Partial Class frmMain Me.lblAufschubBrg_de_VeragAG.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrg_de_VeragAG.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubBrg_de_VeragAG.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrg_de_VeragAG.Location = New System.Drawing.Point(534, 268) + Me.lblAufschubBrg_de_VeragAG.Location = New System.Drawing.Point(534, 288) Me.lblAufschubBrg_de_VeragAG.Name = "lblAufschubBrg_de_VeragAG" Me.lblAufschubBrg_de_VeragAG.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrg_de_VeragAG.Size = New System.Drawing.Size(90, 13) @@ -1667,7 +1755,7 @@ Partial Class frmMain Me.lblAufschubAkt_de_VeragAG.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubAkt_de_VeragAG.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubAkt_de_VeragAG.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubAkt_de_VeragAG.Location = New System.Drawing.Point(293, 275) + Me.lblAufschubAkt_de_VeragAG.Location = New System.Drawing.Point(293, 295) Me.lblAufschubAkt_de_VeragAG.Name = "lblAufschubAkt_de_VeragAG" Me.lblAufschubAkt_de_VeragAG.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubAkt_de_VeragAG.Size = New System.Drawing.Size(90, 13) @@ -1690,7 +1778,7 @@ Partial Class frmMain Me.lblAufschubBrg_at_VeragAG.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubBrg_at_VeragAG.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubBrg_at_VeragAG.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubBrg_at_VeragAG.Location = New System.Drawing.Point(534, 485) + Me.lblAufschubBrg_at_VeragAG.Location = New System.Drawing.Point(534, 505) Me.lblAufschubBrg_at_VeragAG.Name = "lblAufschubBrg_at_VeragAG" Me.lblAufschubBrg_at_VeragAG.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubBrg_at_VeragAG.Size = New System.Drawing.Size(90, 13) @@ -1705,7 +1793,7 @@ Partial Class frmMain Me.lblAufschubStatus_at_VeragAG.Cursor = System.Windows.Forms.Cursors.Help Me.lblAufschubStatus_at_VeragAG.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAufschubStatus_at_VeragAG.ForeColor = System.Drawing.Color.White - Me.lblAufschubStatus_at_VeragAG.Location = New System.Drawing.Point(630, 485) + Me.lblAufschubStatus_at_VeragAG.Location = New System.Drawing.Point(630, 505) Me.lblAufschubStatus_at_VeragAG.Name = "lblAufschubStatus_at_VeragAG" Me.lblAufschubStatus_at_VeragAG.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubStatus_at_VeragAG.Size = New System.Drawing.Size(22, 13) @@ -1717,7 +1805,7 @@ Partial Class frmMain Me.lblAufschubAkt_at_VeragAG.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblAufschubAkt_at_VeragAG.Cursor = System.Windows.Forms.Cursors.Hand Me.lblAufschubAkt_at_VeragAG.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblAufschubAkt_at_VeragAG.Location = New System.Drawing.Point(293, 486) + Me.lblAufschubAkt_at_VeragAG.Location = New System.Drawing.Point(293, 506) Me.lblAufschubAkt_at_VeragAG.Name = "lblAufschubAkt_at_VeragAG" Me.lblAufschubAkt_at_VeragAG.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubAkt_at_VeragAG.Size = New System.Drawing.Size(90, 13) @@ -1733,7 +1821,7 @@ Partial Class frmMain Me.lblAufschubStatus_de_VeragAG.Cursor = System.Windows.Forms.Cursors.Help Me.lblAufschubStatus_de_VeragAG.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAufschubStatus_de_VeragAG.ForeColor = System.Drawing.Color.White - Me.lblAufschubStatus_de_VeragAG.Location = New System.Drawing.Point(630, 268) + Me.lblAufschubStatus_de_VeragAG.Location = New System.Drawing.Point(630, 288) Me.lblAufschubStatus_de_VeragAG.Name = "lblAufschubStatus_de_VeragAG" Me.lblAufschubStatus_de_VeragAG.RightToLeft = System.Windows.Forms.RightToLeft.Yes Me.lblAufschubStatus_de_VeragAG.Size = New System.Drawing.Size(22, 13) @@ -1745,7 +1833,7 @@ Partial Class frmMain Me.Label30.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label30.AutoSize = True Me.Label30.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label30.Location = New System.Drawing.Point(410, 252) + Me.Label30.Location = New System.Drawing.Point(410, 272) Me.Label30.Name = "Label30" Me.Label30.Size = New System.Drawing.Size(92, 13) Me.Label30.TabIndex = 1 @@ -1756,7 +1844,7 @@ Partial Class frmMain Me.Label31.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.Label31.AutoSize = True Me.Label31.Font = New System.Drawing.Font("Microsoft Sans Serif", 7.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label31.Location = New System.Drawing.Point(548, 251) + Me.Label31.Location = New System.Drawing.Point(548, 271) Me.Label31.Name = "Label31" Me.Label31.Size = New System.Drawing.Size(108, 13) Me.Label31.TabIndex = 1 @@ -1808,7 +1896,7 @@ Partial Class frmMain Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(671, 608) + Me.ClientSize = New System.Drawing.Size(671, 627) Me.Controls.Add(Me.Panel2) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.MinimizeBox = False @@ -1956,4 +2044,10 @@ Partial Class frmMain Friend WithEvents lblAufschubBrg_de_UNISPEDDE As Label Friend WithEvents lblAufschubStatus_de_UNISPEDDE As Label Friend WithEvents Button3 As Button + Friend WithEvents cbxBrg_at_VERAG_CS As CheckBox + Friend WithEvents lblBrg_at_VERAG_CS As Label + Friend WithEvents lblAtWocheVERAG_CS As Label + Friend WithEvents lblAtTagVERAG_CS As Label + Friend WithEvents lblAt_woche_StatusVERAG_CS As Label + Friend WithEvents lblAt_tag_StatusVERAG_CS As Label End Class diff --git a/VERAGMonitoring/frmMain.vb b/VERAGMonitoring/frmMain.vb index 5fd9199..679bb1f 100644 --- a/VERAGMonitoring/frmMain.vb +++ b/VERAGMonitoring/frmMain.vb @@ -86,6 +86,7 @@ Public Class frmMain allowCBX(cbxAufschubEUST_de_VeragAG, False) allowCBX(cbxAufschubEUST_de_Imex, False) allowCBX(cbxBrg_at_UNISPED, False) + allowCBX(cbxBrg_at_VERAG_CS, False) allowCBX(cbxAufschub_at_IMEX, False) allowCBX(cbxAufschubEUST_de_Global, False) allowCBX(cbxAufschubEUST_de_UnispedDE, False) @@ -95,6 +96,7 @@ Public Class frmMain allowCBX(cbxAufschubEUST_de_Unisped, True) allowCBX(cbxAufschub_de_Unisped, True) allowCBX(cbxBrg_at_UNISPED, True) + allowCBX(cbxBrg_at_VERAG_CS, True) allowCBX(cbxAufschubEUST_de_UnispedDE, True) allowCBX(cbxAufschub_de_UnispedDE, True) End If @@ -197,6 +199,7 @@ Public Class frmMain allowCBX(cbxAufschubEUST_de_Unisped, True) allowCBX(cbxAufschub_de_Unisped, True) allowCBX(cbxBrg_at_UNISPED, True) + allowCBX(cbxBrg_at_VERAG_CS, True) allowCBX(cbxAufschubEUST_de_UnispedDE, True) allowCBX(cbxAufschub_de_UnispedDE, True) @@ -238,6 +241,7 @@ Public Class frmMain allowCBX(cbxAufschubEUST_de_VeragAG, True) allowCBX(cbxAufschubEUST_de_Imex, True) allowCBX(cbxBrg_at_UNISPED, True) + allowCBX(cbxBrg_at_VERAG_CS, True) allowCBX(cbxAufschub_at_IMEX, True) allowCBX(cbxAufschubEUST_de_Global, True) allowCBX(cbxAufschubEUST_de_UnispedDE, True) @@ -328,6 +332,8 @@ Public Class frmMain Dim brg_DE_NEU As String = "17DE0000000071678" Dim brg_AT_IMEX As String = "16AT520000G000VA6" Dim brg_AT_ATILLA As String = "20AT520000G000092" + Dim brg_AT_VERAG_CS As String = "22AT600000G0000H4" + Dim brg_DE_UNISPED As String = "17DE0000000071270" 'If cbxBrg_de_VeragAG.Checked Then 'DE ' 'DE WOCHE @@ -341,12 +347,23 @@ Public Class frmMain ' setLabel(lblDeTag, "0.0") 'End If If cbxBrg_de2_VeragAG.Checked Then 'DE + + Dim DE_DIFFERENZ As Double = 2500000 ' UNBEKANNT DIFFENREZ!!! + 'DE WOCHE Dim woche_de2 As Double = BRG.getBrgSumFromFMZOLL_Zabis(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_DE_NEU) - setLabel(lblDe2Woche, String.Format("{0:C}", CDbl(woche_de2))) + 'NCTS_TR DE WOCHE + Dim DeWoche_nctsTR As Double = BRG.getBrgSumFromFMZOLL_NCTS_TR(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_DE_NEU) + setLabel(lblDe2Woche, String.Format("{0:C}", CDbl(woche_de2 + DeWoche_nctsTR + DE_DIFFERENZ))) + 'DE TAG Dim tag_de2 As Double = BRG.getBrgSumFromFMZOLL_Zabis(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_DE_NEU) - setLabel(lblDe2Tag, String.Format("{0:C}", CDbl(tag_de2))) + 'NCTS_TR AT TAG + Dim DetTag_nctsTR As Double = BRG.getBrgSumFromFMZOLL_NCTS_TR(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_DE_NEU) + + + + setLabel(lblDe2Tag, String.Format("{0:C}", CDbl(tag_de2 + DetTag_nctsTR + DE_DIFFERENZ))) Else setLabel(lblDe2Woche, "0.0") setLabel(lblDe2Tag, "0.0") @@ -359,7 +376,7 @@ Public Class frmMain 'MsgBox(AtWoche_zolaris) 'TELOTEC AT WOCHE Dim AtWoche_TELOTEC As Double = BRG.getBrgSumFromFMZOLL_TELOTEC(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_AT) - 'TELOTEC AT WOCHE + 'NCTS_TR AT WOCHE Dim AtWoche_nctsTR As Double = BRG.getBrgSumFromFMZOLL_NCTS_TR(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_AT) 'AT WOCHE @@ -374,6 +391,11 @@ Public Class frmMain Dim AtTag_telotec As Double = BRG.getBrgSumFromFMZOLL_TELOTEC(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_AT) 'NCTS_TR AT TAG Dim AtTag_nctsTR As Double = BRG.getBrgSumFromFMZOLL_NCTS_TR(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_AT) + + 'MsgBox("AtTag_zolaris: " & AtTag_zolaris) + 'MsgBox("AtTag_atlas: " & AtTag_atlas) + 'MsgBox("AtTag_telotec: " & AtTag_telotec) + 'MsgBox("AtTag_nctsTR: " & AtTag_nctsTR) 'AT TAG Dim tag_at As Double = AtTag_zolaris + AtTag_atlas + AtTag_telotec + AtTag_nctsTR setLabel(lblAtTag, String.Format("{0:C}", CDbl(tag_at))) @@ -439,6 +461,65 @@ Public Class frmMain If cbxBrg_at_Atilla.Checked Then setAlarm("ATILLA | AT - gVV - HZA Linz/Wels Wochenreferenzsumme ", "9", Me.lblAtWocheAtilla, cMonitoringBrg.brgusrset_gvvAt_ATILLA_woche_warn1, cMonitoringBrg.brgusrset_gvvAt_ATILLA_woche_warn2, cMonitoringBrg.brgusrset_gvvAt_ATILLA_de_summe, lblAt_woche_StatusAtilla) + + If cbxBrg_at_VERAG_CS.Checked Then 'AT VERAG CS + 'ATLAS AT WOCHE + Dim AtWoche_atlas As Double = BRG.getBrgSumFromFMZOLL_Zabis(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_AT_verag_cs) + 'ZOLARIS AT WOCHE + Dim AtWoche_zolaris As Double = BRG.getBrgSumFromFMZOLL_Zolaris(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_AT_verag_cs) + 'TELOTEC AT WOCHE + Dim AtWoche_TELOTEC As Double = BRG.getBrgSumFromFMZOLL_TELOTEC(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_AT_verag_cs) + 'AT WOCHE + Dim woche_at As Double = AtWoche_atlas + AtWoche_zolaris + AtWoche_TELOTEC + setLabel(lblAtWocheVERAG_CS, String.Format("{0:C}", CDbl(woche_at))) + + 'ZOLARIS AT TAG + Dim AtTag_zolaris As Double = BRG.getBrgSumFromFMZOLL_Zolaris(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_AT_verag_cs, " AND DatumBestimmungErreicht IS NULL ") + 'ATLAS AT TAG + Dim AtTag_atlas As Double = BRG.getBrgSumFromFMZOLL_Zabis(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_AT_verag_cs) + 'TELOTEC AT TAG + Dim AtTag_telotec As Double = BRG.getBrgSumFromFMZOLL_TELOTEC(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_AT_verag_cs) + 'AT TAG + Dim tag_at As Double = AtTag_zolaris + AtTag_atlas + AtTag_telotec + setLabel(lblAtTagVERAG_CS, String.Format("{0:C}", CDbl(tag_at))) + Else + setLabel(lblAtWocheVERAG_CS, "0.0") + setLabel(lblAtTagVERAG_CS, "0.0") + End If + + If cbxBrg_at_UNISPED.Checked Then 'AT VERAG CS + 'ATLAS AT WOCHE + Dim AtWoche_atlas As Double = BRG.getBrgSumFromFMZOLL_Zabis(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_DE_UNISPED) + 'ZOLARIS AT WOCHE + Dim AtWoche_zolaris As Double = BRG.getBrgSumFromFMZOLL_Zolaris(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_DE_UNISPED) + 'TELOTEC AT WOCHE + Dim AtWoche_TELOTEC As Double = BRG.getBrgSumFromFMZOLL_TELOTEC(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_DE_UNISPED) + 'AT WOCHE + Dim woche_at As Double = AtWoche_atlas + AtWoche_zolaris + AtWoche_TELOTEC + setLabel(lblAtWocheUNISPED, String.Format("{0:C}", CDbl(woche_at))) + + 'ZOLARIS AT TAG + Dim AtTag_zolaris As Double = BRG.getBrgSumFromFMZOLL_Zolaris(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_DE_UNISPED, " AND DatumBestimmungErreicht IS NULL ") + 'ATLAS AT TAG + Dim AtTag_atlas As Double = BRG.getBrgSumFromFMZOLL_Zabis(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_DE_UNISPED) + 'TELOTEC AT TAG + Dim AtTag_telotec As Double = BRG.getBrgSumFromFMZOLL_TELOTEC(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_DE_UNISPED) + 'AT TAG + Dim tag_at As Double = AtTag_zolaris + AtTag_atlas + AtTag_telotec + setLabel(lblAtTagUNISPED, String.Format("{0:C}", CDbl(tag_at))) + Else + setLabel(lblAtWocheUNISPED, "0.0") + setLabel(lblAtTagUNISPED, "0.0") + End If + + ' If cbxBrg_at_UNISPED.Checked Then setAlarm("UNISPED - gVV - HZA München UNISPED", "19", Me.lblAtTagUNISPED, cMonitoringBrg.brgusrset_gvvAt_UNISPED_tag_warn1, cMonitoringBrg.brgusrset_gvvAt_UNISPED_tag_warn2, cMonitoringBrg.brgusrset_gvvAt_UNISPED_de_summe, lblAt_tag_StatusUNISPED) + ' If cbxBrg_at_UNISPED.Checked Then setAlarm("UNISPED - gVV - HZA München UNISPED", "19", Me.lblAtWocheUNISPED, cMonitoringBrg.brgusrset_gvvAt_UNISPED_woche_warn1, cMonitoringBrg.brgusrset_gvvAt_UNISPED_woche_warn2, cMonitoringBrg.brgusrset_gvvAt_UNISPED_de_summe, lblAt_woche_StatusUNISPED) + + If cbxBrg_at_VERAG_CS.Checked Then setAlarm("VERAG CS | AT - gVV - HZA Linz/Wels Tagessaldo", "19", Me.lblAtTagVERAG_CS, cMonitoringBrg.brgusrset_gvvAt_VERAG_CS_tag_warn1, cMonitoringBrg.brgusrset_gvvAt_VERAG_CS_tag_warn2, cMonitoringBrg.brgusrset_gvvAt_VERAG_CS_de_summe, lblAt_tag_StatusVERAG_CS) + If cbxBrg_at_VERAG_CS.Checked Then setAlarm("VERAG CS | AT - gVV - HZA Linz/Wels Wochenreferenzsumme ", "19", Me.lblAtWocheVERAG_CS, cMonitoringBrg.brgusrset_gvvAt_VERAG_CS_woche_warn1, cMonitoringBrg.brgusrset_gvvAt_VERAG_CS_woche_warn2, cMonitoringBrg.brgusrset_gvvAt_VERAG_CS_de_summe, lblAt_woche_StatusVERAG_CS) + + + If cbxBrg_at_VeragAG.Checked Then setAlarm("AT - gVV - HZA Linz/Wels Tagessaldo", "6_1", Me.lblAtTag, cMonitoringBrg.brgusrset_gvvAt_tag_warn1, cMonitoringBrg.brgusrset_gvvAt_tag_warn2, cMonitoringBrg.brgusrset_gvvAt_summe, lblAt_tag_Status) ' If cbxBrg_de_VeragAG.Checked Then setAlarm("DE - gVV - HZA München Tagessaldo", "6_2", Me.lblDeTag, cMonitoringBrg.brgusrset_gvvDe_tag_warn1, cMonitoringBrg.brgusrset_gvvDe_tag_warn2, cMonitoringBrg.brgusrset_gvvDe_summe, lblDe_tag_Status) If cbxBrg_de2_VeragAG.Checked Then setAlarm("DE NEU - gVV - HZA München Tagessaldo", "6_2", Me.lblDe2Tag, cMonitoringBrg.brgusrset_gvvDe2_tag_warn1, cMonitoringBrg.brgusrset_gvvDe2_tag_warn2, cMonitoringBrg.brgusrset_gvvDe2_summe, lblDe2_tag_Status) @@ -1089,7 +1170,7 @@ Public Class frmMain End Try Return True End Function - Private Sub cbxBrg_de_VeragAG_CheckedChanged(sender As Object, e As EventArgs) Handles cbxBrg_de2_VeragAG.CheckedChanged, cbxBrg_at_VeragAG.CheckedChanged, cbxAufschub_de_VeragAG.CheckedChanged, cbxAufschub_at_VeragAG.CheckedChanged, cbxAufschub_at_VeragCS.CheckedChanged, cbxAufschub_at_VeragZS.CheckedChanged, cbxAufschubEUST_de_VeragAG.CheckedChanged, cbxAufschubEUST_de_Imex.CheckedChanged, cbxAufschubEUST_de_Global.CheckedChanged, cbxAufschub_de_Unisped.CheckedChanged, cbxAufschubEUST_de_Unisped.CheckedChanged, cbxAufschub_de_UnispedDE.CheckedChanged, cbxAufschubEUST_de_UnispedDE.CheckedChanged, cbxAufschub_at_IMEX.CheckedChanged, cbxBrg_at_UNISPED.CheckedChanged, cbxBrg_at_Atilla.CheckedChanged, cbxBrg_at_Imex.CheckedChanged + Private Sub cbxBrg_de_VeragAG_CheckedChanged(sender As Object, e As EventArgs) Handles cbxBrg_de2_VeragAG.CheckedChanged, cbxBrg_at_VeragAG.CheckedChanged, cbxAufschub_de_VeragAG.CheckedChanged, cbxAufschub_at_VeragAG.CheckedChanged, cbxAufschub_at_VeragCS.CheckedChanged, cbxAufschub_at_VeragZS.CheckedChanged, cbxAufschubEUST_de_VeragAG.CheckedChanged, cbxAufschubEUST_de_Imex.CheckedChanged, cbxAufschubEUST_de_Global.CheckedChanged, cbxAufschub_de_Unisped.CheckedChanged, cbxAufschubEUST_de_Unisped.CheckedChanged, cbxAufschub_de_UnispedDE.CheckedChanged, cbxAufschubEUST_de_UnispedDE.CheckedChanged, cbxAufschub_at_IMEX.CheckedChanged, cbxBrg_at_UNISPED.CheckedChanged, cbxBrg_at_VERAG_CS.CheckedChanged, cbxBrg_at_Atilla.CheckedChanged, cbxBrg_at_Imex.CheckedChanged 'MsgBox(sender.name) Me.Cursor = Cursors.WaitCursor If loaded Then @@ -1142,13 +1223,15 @@ Public Class frmMain End Sub Private Sub lblAufschubBrg_at_VeragAG_Click(sender As Object, e As EventArgs) Handles lblAufschubBrg_at_VeragAG.Click - Dim brg_AT_VeragAG As String = "3025365" - Dim von As Date = DateSerial(Now.Year, Now.Month, 1) - Dim vonbrg As Date = von - If Now.Day <= 15 Then vonbrg = von.AddMonths(-1) - frmShowData.Show() - frmShowData.dgv.DataSource = BRG.loadDgvBySqlZOLARIS(vonbrg.ToShortDateString, Now.ToShortDateString, brg_AT_VeragAG) - frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + If cbxAufschub_at_VeragAG.Checked Then + Dim brg_AT_VeragAG As String = "3025365" + Dim von As Date = DateSerial(Now.Year, Now.Month, 1) + Dim vonbrg As Date = von + If Now.Day <= 15 Then vonbrg = von.AddMonths(-1) + frmShowData.Show() + frmShowData.dgv.DataSource = BRG.loadDgvBySqlZOLARIS(vonbrg.ToShortDateString, Now.ToShortDateString, brg_AT_VeragAG) + frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + End If End Sub Private Sub lblAufschubAkt_at_VeragCS_Click(sender As Object, e As EventArgs) Handles lblAufschubAkt_at_VeragCS.Click @@ -1160,13 +1243,15 @@ Public Class frmMain End Sub Private Sub lblAufschubBrg_at_VeragCS_Click(sender As Object, e As EventArgs) Handles lblAufschubBrg_at_VeragCS.Click - Dim brg_AT_VeragCS As String = "3517233" - Dim von As Date = DateSerial(Now.Year, Now.Month, 1) - Dim vonbrg As Date = von - If Now.Day <= 15 Then vonbrg = von.AddMonths(-1) - frmShowData.Show() - frmShowData.dgv.DataSource = BRG.loadDgvBySqlZOLARIS(vonbrg.ToShortDateString, Now.ToShortDateString, brg_AT_VeragCS) - frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + If cbxAufschub_at_VeragCS.Checked Then + Dim brg_AT_VeragCS As String = "3517233" + Dim von As Date = DateSerial(Now.Year, Now.Month, 1) + Dim vonbrg As Date = von + If Now.Day <= 15 Then vonbrg = von.AddMonths(-1) + frmShowData.Show() + frmShowData.dgv.DataSource = BRG.loadDgvBySqlZOLARIS(vonbrg.ToShortDateString, Now.ToShortDateString, brg_AT_VeragCS) + frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + End If End Sub Private Sub lblAufschubAkt_at_VeragZS_Click(sender As Object, e As EventArgs) Handles lblAufschubAkt_at_VeragZS.Click @@ -1178,13 +1263,15 @@ Public Class frmMain End Sub Private Sub lblAufschubBrg_at_VeragZS_Click(sender As Object, e As EventArgs) Handles lblAufschubBrg_at_VeragZS.Click - Dim brg_AT_VeragZS As String = "3026400" - Dim von As Date = DateSerial(Now.Year, Now.Month, 1) - Dim vonbrg As Date = von - If Now.Day <= 15 Then vonbrg = von.AddMonths(-1) - frmShowData.Show() - frmShowData.dgv.DataSource = BRG.loadDgvBySqlZOLARIS(vonbrg.ToShortDateString, Now.ToShortDateString, brg_AT_VeragZS) - frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + If cbxAufschub_at_VeragZS.Checked Then + Dim brg_AT_VeragZS As String = "3026400" + Dim von As Date = DateSerial(Now.Year, Now.Month, 1) + Dim vonbrg As Date = von + If Now.Day <= 15 Then vonbrg = von.AddMonths(-1) + frmShowData.Show() + frmShowData.dgv.DataSource = BRG.loadDgvBySqlZOLARIS(vonbrg.ToShortDateString, Now.ToShortDateString, brg_AT_VeragZS) + frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + End If End Sub Private Sub lblAufschubAkt_de_VeragAG_Click(sender As Object, e As EventArgs) Handles lblAufschubAkt_de_VeragAG.Click @@ -1197,7 +1284,9 @@ Public Class frmMain End Sub Private Sub lblAufschubBrg_de_VeragAG_Click(sender As Object, e As EventArgs) Handles lblAufschubBrg_de_VeragAG.Click - Dim brg_DE_VeragAG As String = "1" + If cbxAufschub_de_VeragAG.Checked Then + + Dim brg_DE_VeragAG As String = "1" Dim von As Date = DateSerial(Now.Year, Now.Month, 1) Dim vonbrg As Date = von Dim vonFaell As Date = von @@ -1214,9 +1303,10 @@ Public Class frmMain faelligkeitWhere &= ") " frmShowData.dgv.DataSource = BRG.loadDgvBySqlFromAufschubKto_Faelligkeit(faelligkeitWhere, brg_DE_VeragAG) - ' frmShowData.dgv.DataSource = BRG.loadDgvBySqlFromAufschubKto(vonbrg.ToShortDateString, Now.ToShortDateString, brg_DE_VeragAG) + ' frmShowData.dgv.DataSource = BRG.loadDgvBySqlFromAufschubKto(vonbrg.ToShortDateString, Now.ToShortDateString, brg_DE_VeragAG) - frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + End If End Sub Private Sub lblDeTag_Click(sender As Object, e As EventArgs) @@ -1233,40 +1323,51 @@ Public Class frmMain End Sub Private Sub lblAtTag_Click(sender As Object, e As EventArgs) Handles lblAtTag.Click - Dim brg_AT As String = "05AT510000G000FP7" - Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddMonths(-3), Now) + If cbxBrg_at_VeragAG.Checked Then + Dim brg_AT As String = "05AT510000G000FP7" + Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddMonths(-3), Now) frmShowData.Show() + End If ' frmShowDataDouble.dgv1.DataSource = BRG.loadDgvBySqlFromBrgKtoAtlas(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_AT) ' frmShowDataDouble.dgv2.DataSource = BRG.loadDgvBySqlFromBrgKtoUnionEZoll(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_AT) ' frmShowDataDouble.Label2.Text = "Anzahl: " & (frmShowDataDouble.dgv2.RowCount + frmShowDataDouble.dgv2.RowCount) End Sub Private Sub lblAtTagimex_Click(sender As Object, e As EventArgs) Handles lblAtTagImex.Click - Dim brg_AT As String = "16AT520000G000VA6" + If cbxBrg_at_Imex.Checked Then + + Dim brg_AT As String = "16AT520000G000VA6" Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddMonths(-3), Now) frmShowData.Show() + End If ' frmShowDataDouble.dgv1.DataSource = BRG.loadDgvBySqlFromBrgKtoAtlas(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_AT) ' frmShowDataDouble.dgv2.DataSource = BRG.loadDgvBySqlFromBrgKtoUnionEZoll(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_AT) ' frmShowDataDouble.Label2.Text = "Anzahl: " & (frmShowDataDouble.dgv2.RowCount + frmShowDataDouble.dgv2.RowCount) End Sub Private Sub lblAtWoche_Click(sender As Object, e As EventArgs) Handles lblAtWoche.Click - Dim brg_AT As String = "05AT510000G000FP7" + If cbxBrg_at_VeragAG.Checked Then + + Dim brg_AT As String = "05AT510000G000FP7" Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddDays(-6), Now) frmShowData.Show() + End If ' frmShowDataDouble.Show() ' frmShowDataDouble.dgv1.DataSource = BRG.loadDgvBySqlFromBrgKtoAtlas(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_AT) ' frmShowDataDouble.dgv2.DataSource = BRG.loadDgvBySqlFromBrgKtoUnionEZoll(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_AT) ' frmShowDataDouble.Label2.Text = "Anzahl: " & (frmShowDataDouble.dgv2.RowCount + frmShowDataDouble.dgv2.RowCount) End Sub Private Sub lblAtWocheimex_Click(sender As Object, e As EventArgs) Handles lblAtWocheImex.Click - Dim brg_AT As String = "16AT520000G000VA6" + If cbxBrg_at_Imex.Checked Then + + Dim brg_AT As String = "16AT520000G000VA6" Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddDays(-6), Now) frmShowData.Show() + End If ' frmShowDataDouble.Show() ' frmShowDataDouble.dgv1.DataSource = BRG.loadDgvBySqlFromBrgKtoAtlas(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_AT) @@ -1319,15 +1420,19 @@ Public Class frmMain End Sub Private Sub lblDe2Tag_Click(sender As Object, e As EventArgs) Handles lblDe2Tag.Click - Dim brg_DE_NEU As String = "17DE0000000071678" - Dim frmShowData = New frmShowData("BRG", brg_DE_NEU, Now.AddMonths(-3), Now) - frmShowData.Show() + If cbxBrg_de2_VeragAG.Checked Then + Dim brg_DE_NEU As String = "17DE0000000071678" + Dim frmShowData = New frmShowData("BRG", brg_DE_NEU, Now.AddMonths(-3), Now) + frmShowData.Show() + End If End Sub Private Sub lblDe2Woche_Click(sender As Object, e As EventArgs) Handles lblDe2Woche.Click - Dim brg_DE_NEU As String = "17DE0000000071678" - Dim frmShowData = New frmShowData("BRG", brg_DE_NEU, Now.AddDays(-6), Now) - frmShowData.Show() + If cbxBrg_de2_VeragAG.Checked Then + Dim brg_DE_NEU As String = "17DE0000000071678" + Dim frmShowData = New frmShowData("BRG", brg_DE_NEU, Now.AddDays(-6), Now) + frmShowData.Show() + End If End Sub Private Sub Button3_Click_3(sender As Object, e As EventArgs) Handles btnBelastungAufheben.Click @@ -1363,7 +1468,9 @@ Public Class frmMain End Sub Private Sub lblAufschubBrg_de_Imex_Click(sender As Object, e As EventArgs) Handles lblAufschubBrg_de_Imex.Click - Dim brg_DE_Imex As String = "8" + If cbxAufschub_de_Imex.Checked Then + + Dim brg_DE_Imex As String = "8" Dim von As Date = DateSerial(Now.Year, Now.Month, 1) Dim vonbrg As Date = von Dim vonFaell As Date = von @@ -1382,19 +1489,24 @@ Public Class frmMain frmShowData.dgv.DataSource = BRG.loadDgvBySqlFromAufschubKto_Faelligkeit(faelligkeitWhere, brg_DE_Imex) - frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + End If End Sub Private Sub lblAtTagAtilla_Click(sender As Object, e As EventArgs) Handles lblAtTagAtilla.Click - Dim brg_AT As String = "20AT520000G000092" - Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddMonths(-3), Now) - frmShowData.Show() + If cbxBrg_at_Atilla.Checked Then + Dim brg_AT As String = "20AT520000G000092" + Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddMonths(-3), Now) + frmShowData.Show() + End If End Sub Private Sub lblAtWocheAtilla_Click(sender As Object, e As EventArgs) Handles lblAtWocheAtilla.Click - Dim brg_AT As String = "20AT520000G000092" - Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddDays(-6), Now) - frmShowData.Show() + If cbxBrg_at_Atilla.Checked Then + Dim brg_AT As String = "20AT520000G000092" + Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddDays(-6), Now) + frmShowData.Show() + End If End Sub Dim secondmonitorSelected = False @@ -1424,11 +1536,121 @@ Public Class frmMain End Sub Private Sub lblAufschubBrgEUST_de_UNISPEDDE_Click(sender As Object, e As EventArgs) Handles lblAufschubBrgEUST_de_UNISPEDDE.Click - Dim frmShowData As New frmShowData - frmShowData.dgv.DataSource = getAufschubDT("EUST", 17) + If cbxAufschubEUST_de_UnispedDE.Checked Then + Dim frmShowData As New frmShowData + frmShowData.dgv.DataSource = getAufschubDT("EUST", 15) - frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount - frmShowData.Show() + frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + frmShowData.Show() + End If + End Sub + + Private Sub lblAufschubBrgEUST_de_VeragAG_Click(sender As Object, e As EventArgs) Handles lblAufschubBrgEUST_de_VeragAG.Click + If cbxAufschubEUST_de_VeragAG.Checked Then + Dim frmShowData As New frmShowData + frmShowData.dgv.DataSource = getAufschubDT("EUST", 11) + + frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + frmShowData.Show() + End If + End Sub + + Private Sub Panel2_Paint(sender As Object, e As PaintEventArgs) Handles Panel2.Paint + + End Sub + + Private Sub lblAufschubBrgEUST_de_global_Click(sender As Object, e As EventArgs) Handles lblAufschubBrgEUST_de_global.Click + If cbxAufschubEUST_de_Global.Checked Then + Dim frmShowData As New frmShowData + frmShowData.dgv.DataSource = getAufschubDT("EUST", 10) + + frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + frmShowData.Show() + End If + End Sub + + Private Sub lblAufschubBrgEUST_de_Imex_Click(sender As Object, e As EventArgs) Handles lblAufschubBrgEUST_de_Imex.Click + If cbxAufschubEUST_de_Imex.Checked Then + Dim frmShowData As New frmShowData + frmShowData.dgv.DataSource = getAufschubDT("EUST", 12) + + frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + frmShowData.Show() + End If + End Sub + + Private Sub lblAufschubBrgEUST_de_UNISPED_Click(sender As Object, e As EventArgs) Handles lblAufschubBrgEUST_de_UNISPED.Click + If cbxAufschubEUST_de_Unisped.Checked Then + Dim frmShowData As New frmShowData + frmShowData.dgv.DataSource = getAufschubDT("EUST", 17) + + frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + frmShowData.Show() + End If + End Sub + + Private Sub lblAufschubBrg_de_UNISPED_Click(sender As Object, e As EventArgs) Handles lblAufschubBrg_de_UNISPED.Click + If cbxAufschub_de_Unisped.Checked Then + Dim frmShowData As New frmShowData + frmShowData.dgv.DataSource = getAufschubDT("ZOLL", 16) + + frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + frmShowData.Show() + End If + End Sub + + Private Sub lblAufschubBrg_de_UNISPEDDE_Click(sender As Object, e As EventArgs) Handles lblAufschubBrg_de_UNISPEDDE.Click + If cbxAufschub_de_UnispedDE.Checked Then + Dim frmShowData As New frmShowData + frmShowData.dgv.DataSource = getAufschubDT("ZOLL", 14) + + frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + frmShowData.Show() + End If + End Sub + + Private Sub lblAtTagUNISPED_Click(sender As Object, e As EventArgs) Handles lblAtTagUNISPED.Click + If cbxBrg_at_UNISPED.Checked Then + Dim brg_AT As String = "17DE0000000071270" + Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddMonths(-3), Now) + frmShowData.Show() + End If + End Sub + + Private Sub lblAtTagVERAG_CS_Click(sender As Object, e As EventArgs) Handles lblAtTagVERAG_CS.Click + If cbxBrg_at_VERAG_CS.Checked Then + Dim brg_AT As String = "22AT600000G0000H4" + Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddMonths(-3), Now) + frmShowData.Show() + End If + End Sub + + Private Sub lblAtWocheVERAG_CS_Click(sender As Object, e As EventArgs) Handles lblAtWocheVERAG_CS.Click + If cbxBrg_at_VERAG_CS.Checked Then + Dim brg_AT As String = "22AT600000G0000H4" + Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddDays(-6), Now) + frmShowData.Show() + End If + End Sub + + Private Sub lblAtWocheUNISPED_Click(sender As Object, e As EventArgs) Handles lblAtWocheUNISPED.Click + If cbxBrg_at_UNISPED.Checked Then + Dim brg_AT As String = "17DE0000000071270" + Dim frmShowData = New frmShowData("BRG", brg_AT, Now.AddDays(-6), Now) + frmShowData.Show() + End If + End Sub + + Private Sub lblAufschubBrg_at_IMEX_Click(sender As Object, e As EventArgs) Handles lblAufschubBrg_at_IMEX.Click + If cbxAufschub_at_IMEX.Checked Then + Dim brg_AT_VeragZS As String = "3027279" + Dim von As Date = DateSerial(Now.Year, Now.Month, 1) + Dim vonbrg As Date = von + If Now.Day <= 15 Then vonbrg = von.AddMonths(-1) + frmShowData.Show() + frmShowData.dgv.DataSource = BRG.loadDgvBySqlZOLARIS(vonbrg.ToShortDateString, Now.ToShortDateString, brg_AT_VeragZS) + frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount + End If End Sub End Class diff --git a/VERAGMonitoring/frmShowData.Designer.vb b/VERAGMonitoring/frmShowData.Designer.vb index 9609800..8e623e2 100644 --- a/VERAGMonitoring/frmShowData.Designer.vb +++ b/VERAGMonitoring/frmShowData.Designer.vb @@ -32,10 +32,10 @@ Partial Class frmShowData Me.TabPage1 = New System.Windows.Forms.TabPage() Me.TabPage3 = New System.Windows.Forms.TabPage() Me.TabPage4 = New System.Windows.Forms.TabPage() + Me.NCTS_TR = New System.Windows.Forms.TabPage() Me.Button1 = New System.Windows.Forms.Button() Me.Label2 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() - Me.NCTS_TR = New System.Windows.Forms.TabPage() CType(Me.dgv, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() Me.tbcntr.SuspendLayout() @@ -49,10 +49,12 @@ Partial Class frmShowData Me.dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.ColumnHeader Me.dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgv.Dock = System.Windows.Forms.DockStyle.Fill - Me.dgv.Location = New System.Drawing.Point(0, 55) + Me.dgv.Location = New System.Drawing.Point(0, 85) + Me.dgv.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.dgv.Name = "dgv" Me.dgv.ReadOnly = True - Me.dgv.Size = New System.Drawing.Size(1056, 831) + Me.dgv.RowHeadersWidth = 62 + Me.dgv.Size = New System.Drawing.Size(1584, 1278) Me.dgv.TabIndex = 1 ' 'Panel1 @@ -65,24 +67,27 @@ Partial Class frmShowData Me.Panel1.Controls.Add(Me.Label1) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top Me.Panel1.Location = New System.Drawing.Point(0, 0) + Me.Panel1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1056, 55) + Me.Panel1.Size = New System.Drawing.Size(1584, 85) Me.Panel1.TabIndex = 2 ' 'datBIS ' Me.datBIS.Format = System.Windows.Forms.DateTimePickerFormat.[Short] - Me.datBIS.Location = New System.Drawing.Point(448, 13) + Me.datBIS.Location = New System.Drawing.Point(672, 20) + Me.datBIS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.datBIS.Name = "datBIS" - Me.datBIS.Size = New System.Drawing.Size(94, 20) + Me.datBIS.Size = New System.Drawing.Size(139, 26) Me.datBIS.TabIndex = 4 ' 'datVON ' Me.datVON.Format = System.Windows.Forms.DateTimePickerFormat.[Short] - Me.datVON.Location = New System.Drawing.Point(245, 13) + Me.datVON.Location = New System.Drawing.Point(368, 20) + Me.datVON.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.datVON.Name = "datVON" - Me.datVON.Size = New System.Drawing.Size(94, 20) + Me.datVON.Size = New System.Drawing.Size(139, 26) Me.datVON.TabIndex = 4 ' 'tbcntr @@ -94,56 +99,73 @@ Partial Class frmShowData Me.tbcntr.Controls.Add(Me.TabPage3) Me.tbcntr.Controls.Add(Me.TabPage4) Me.tbcntr.Controls.Add(Me.NCTS_TR) - Me.tbcntr.Location = New System.Drawing.Point(0, 31) + Me.tbcntr.Location = New System.Drawing.Point(0, 48) + Me.tbcntr.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbcntr.Name = "tbcntr" Me.tbcntr.SelectedIndex = 0 - Me.tbcntr.Size = New System.Drawing.Size(1053, 26) + Me.tbcntr.Size = New System.Drawing.Size(1580, 40) Me.tbcntr.TabIndex = 3 ' 'TabPage2 ' - Me.TabPage2.Location = New System.Drawing.Point(4, 22) + Me.TabPage2.Location = New System.Drawing.Point(4, 29) + Me.TabPage2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(1045, 0) + Me.TabPage2.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.TabPage2.Size = New System.Drawing.Size(1572, 7) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "DAKOSY" Me.TabPage2.UseVisualStyleBackColor = True ' 'TabPage1 ' - Me.TabPage1.Location = New System.Drawing.Point(4, 22) + Me.TabPage1.Location = New System.Drawing.Point(4, 29) + Me.TabPage1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.TabPage1.Name = "TabPage1" - Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(1045, 0) + Me.TabPage1.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.TabPage1.Size = New System.Drawing.Size(1572, 7) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "BLUJAY" Me.TabPage1.UseVisualStyleBackColor = True ' 'TabPage3 ' - Me.TabPage3.Location = New System.Drawing.Point(4, 22) + Me.TabPage3.Location = New System.Drawing.Point(4, 29) + Me.TabPage3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(1045, 0) + Me.TabPage3.Size = New System.Drawing.Size(1572, 7) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "EZOLL" Me.TabPage3.UseVisualStyleBackColor = True ' 'TabPage4 ' - Me.TabPage4.Location = New System.Drawing.Point(4, 22) + Me.TabPage4.Location = New System.Drawing.Point(4, 29) + Me.TabPage4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.TabPage4.Name = "TabPage4" - Me.TabPage4.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage4.Size = New System.Drawing.Size(1045, 0) + Me.TabPage4.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.TabPage4.Size = New System.Drawing.Size(1572, 7) Me.TabPage4.TabIndex = 3 Me.TabPage4.Text = "TELOTEC" Me.TabPage4.UseVisualStyleBackColor = True ' + 'NCTS_TR + ' + Me.NCTS_TR.Location = New System.Drawing.Point(4, 29) + Me.NCTS_TR.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.NCTS_TR.Name = "NCTS_TR" + Me.NCTS_TR.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.NCTS_TR.Size = New System.Drawing.Size(1572, 7) + Me.NCTS_TR.TabIndex = 4 + Me.NCTS_TR.Text = "NCTS_FREMD" + Me.NCTS_TR.UseVisualStyleBackColor = True + ' 'Button1 ' - Me.Button1.Location = New System.Drawing.Point(599, 5) + Me.Button1.Location = New System.Drawing.Point(898, 8) + Me.Button1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(123, 23) + Me.Button1.Size = New System.Drawing.Size(184, 35) Me.Button1.TabIndex = 1 Me.Button1.Text = "In Excel konvertieren" Me.Button1.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -152,9 +174,10 @@ Partial Class frmShowData 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(956, 9) + Me.Label2.Location = New System.Drawing.Point(1434, 14) + Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(42, 13) + Me.Label2.Size = New System.Drawing.Size(62, 20) Me.Label2.TabIndex = 0 Me.Label2.Text = "Anzahl:" Me.Label2.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -163,30 +186,22 @@ Partial Class frmShowData ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.Location = New System.Drawing.Point(3, 9) + Me.Label1.Location = New System.Drawing.Point(4, 14) + Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(75, 13) + Me.Label1.Size = New System.Drawing.Size(111, 20) Me.Label1.TabIndex = 0 Me.Label1.Text = "Datensätze:" ' - 'NCTS_TR - ' - Me.NCTS_TR.Location = New System.Drawing.Point(4, 22) - Me.NCTS_TR.Name = "NCTS_TR" - Me.NCTS_TR.Padding = New System.Windows.Forms.Padding(3) - Me.NCTS_TR.Size = New System.Drawing.Size(1045, 0) - Me.NCTS_TR.TabIndex = 4 - Me.NCTS_TR.Text = "NCTS_TR" - Me.NCTS_TR.UseVisualStyleBackColor = True - ' 'frmShowData ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1056, 886) + Me.ClientSize = New System.Drawing.Size(1584, 1363) Me.Controls.Add(Me.dgv) Me.Controls.Add(Me.Panel1) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "frmShowData" Me.Text = "Details" CType(Me.dgv, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/VERAGMonitoring/frmShowData.vb b/VERAGMonitoring/frmShowData.vb index f26e241..a059804 100644 --- a/VERAGMonitoring/frmShowData.vb +++ b/VERAGMonitoring/frmShowData.vb @@ -106,7 +106,7 @@ Public Class frmShowData dgv.Columns("veoerz_basbtg").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight End If Case 2 'EZOLL DHF - dgv.DataSource = BRG.loadDgvBySqlFromBrgKtoUnionEZoll(datVON.Value.ToShortDateString, datBIS.Value.ToShortDateString, "50", "50", BRG_GRN) + dgv.DataSource = BRG.loadDgvBySqlFromBrgKtoUnionEZoll(datVON.Value.ToShortDateString, datBIS.Value.ToShortDateString, "50", "50", BRG_GRN, " AND DatumBestimmungErreicht IS NULL ") If dgv.Columns.Count > 0 Then dgv.Columns("GarantieWert").DefaultCellStyle.Format = "N2" dgv.Columns("Gesamtrohmasse").DefaultCellStyle.Format = "N2" @@ -119,7 +119,7 @@ Public Class frmShowData dgv.Columns("Betrag").DefaultCellStyle.Format = "N2" dgv.Columns("Betrag").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight End If - Case 4 'NCTS_TR TELOTEC + Case 4 'NCTS_TR dgv.DataSource = BRG.loadDgvBySqlFromBrgKt_NCTS_TR_Details(datVON.Value.ToShortDateString, datBIS.Value.ToShortDateString, "50", "50", BRG_GRN) If dgv.Columns.Count > 0 Then dgv.Columns("nctsSA_AbgabenBetrag").DefaultCellStyle.Format = "N2" diff --git a/initATLASAufschubkonten/Resources/Muster_IDS_PLATTSPR.xls b/initATLASAufschubkonten/Resources/Muster_IDS_PLATTSPR.xls new file mode 100644 index 0000000000000000000000000000000000000000..724d3516018c4064f76aa61a015d28a6d418ace6 GIT binary patch literal 30208 zcmeG_2Ut|s(r1?imZqQ-fe5PPtX=0@bSYkuUQWSwKi$Md5O6)P%6|qGL8Wl_I zSWsdiqOoDa0*bw(hG5kFXYOU$zLNJ|zVE&Kd-=}Yd*;rWnKLt|%(>@Y&i`gmyMCux z9g#YE6E*TlphYyq;0(C#A~$ik|CCXGL(bk`N9>06amzL zm{O9pqt5NA^L7gF5Oww??TBEiU@A#?;D{bcpxkh#KZW-lb?!`^+rXJY_EBYSP!LyQ zMot61U}^!nIw8NSGXe;Yq>xyWO8)M<4B&eRtNR!ET9BJigiR=!nZ!wx5k$$GLgFad zT?vh$^%)EX@go#}g)|t%<1-k9^!_Xt_Gf4?iOFYZ5b%M|)wb7XF$|SpbR)^&0bVT_ zdQv*&kPz^SB$7<{;1?Fefx!T5W!htX7UL#(qjDN(XO9+{6xmt(GZ+k_rBG4}mOD`g z{WGkH1F?cX7ijz((wS`KbS6FF+7V!~cPv=GFi?DOdPC}6+vc$e3-M|`*7^rbK(15&J<2_m@$}xmAIs<-ZF@4hI@$66V zY{42&x)OIqOk=N`R_k(UlRhS-A^63Q? z4)sf)$~g#!Ug$pp$8kj-eKiGeltCW;KLO5wrXf0LJ!=Ahs_*XRJFHcd{$=6Y6~N~x zfEOx&uT=p5NdbJT0=Oc1mMOsBq5!UlK8+8vLMi>w__Anzt1!Wq!*$ZKCZGWfJU zb%pTDFt;N+JHVuvl1EPne+w7XLBrd?wWL4Oe#L<9OCI00GWfJzF#MzNiwq2mb&NrN z+MjU}A&(A(2~vEwQF0mx;Zkz86T&Z(2tx8&>eXHXPK<^1#h#Mldzos)vT!N-Mk4&N zaA_u_!+@brp8O0LIOV~C5e=83Zz6;*Nlc{ePWu&f_0V^7a9-Yg&~{OW=^_P3gHi_# zCqg(&60Qyd1p{UuFu7_zg!s*HR0wsHb8^^*B&UTR0)xoeran!%>;RH00Y@vT5j_}R zu>WU3q6R7$>e|2{#bi-8xQQqWP62U@l_i2EZ3Pk3gkmCS|5gw|H&jdnouw5-G?fxT zMYe(n>QS*I=x(hbg1v=eBIs+MB~lfl+&bu(tstV@I?xDW3V%B^G3IwH!gW7#?)%B{m`9TDZ$>C`$R%B|D6 zHADzeZXM`uKW}1!(|IMW*t&H@lv~H9bwrd~$F_Aulv}4u>xf8NXQ9-%V+TYusc{G6 z5kEgafy}srHyRom1j6o76UHJTGKSk2yRpS!bZ{91(-9G#KZWH_w8daRmO66T(n56w zxJan?xuo?%O`SSbAT1Qaq=iD5v``3ZmI<^ZEtI{4P=0IU&ziqoS*>R38QbolvuI=PGIoH z$(QF^)FVs8MS@5XR{;^h(;_h<*;1mr0ugnnGR;sRsA`c!=()Rg?Glh?B0|rlV5le1 ziO_Q?7}g!UN9egNFz_DP3b;#FfM~SvZkfiR76hj#El|8=b?*TfwC>SPn8bC@kmc%0 zp$R9C(gm2}7KcXM%vE{@>eU(|0>5TgQb5GJHAGs5Vg>c@4n!2!pD9~^d;%u&J(>Q3 zVgo3GJO;Xr0}Q33CX^0g zLO&BaAi}`UsI@tv10sxON62Dkdw2{4k)@jp$A;s`2^c?_o5put#11EmaPVk87%U4x z8{!5r1Bci^a)cB>#*@jg2AoE%m!tj|M3-o?xQVx(HVV}7nn4v8*kAyHoD5_*xyf?s ztdx@*kZk6p&Q1JKe?>m0b~2pYWjWa@3xlc5YJPgzb*N;%Q(oT?L>n|QshK|UuV8BSiZoZOUhqB{eMlNLAe?#mnU zIT<4-kI(p?C2;a+mG4!B9KQNOJ|`0yPI7$DN+~CC->VAwOl3I9@jZK`oWy;vDn#&LrF>3iGMwc2p0iR;;=WfEvisyi`JBvUILYxn zccq-feXlCyWbJPGoW4L#UZ3$j4sh~nmG8N^uR8vK<^=5-w+poNdmUvs$?-jFrJTfl z&&~bqj(qu?EMz#z@jW}GoWy<4&Aqa+Qa&e38BTJ1&p|0Cao=-u7hF%2&xs?$NsjNi zDCH#Xdv5LvHaE8?X*+e2;UvfRJd|=0_dPfF&F2@$tCKD~#)J5-Wv~s98f-fXG!+i7 zgp6EOEuW~Bh$#4%G|^5{M8!RdkmtFs@`+lDh=MCg6Sa{dD(*al;LL@Z2uLbg7v>Nx z)d#PUCfZessJNd%%PJ@GiQ0;Yf`dpCb(A71?h=Ib;r$|?XcrMt@C9k2u2MwBtxrhC zwtn)7+EGNaGLvHCxQp16B(2XhqKIaZOxTPN3mZPTpgm1$a-|OQHVmXur+AGsIjWP< z0LK*q7=SFEV@u?;Byx+HZQ=1WJkSW_^0@KIX<2DWi`Y}8q@r^|spy*TgJ%V&q{&yUA*ePO%A)wPs>R4#q}qx9ZYA{Kc?8U%gLz5ZxU`ha zMeHca+NhZd*dPrLWZ{CD(?G6Fs09mV%TjY^G_NMaP1y2jMGA8oP-!EWj>GDIFmHTn zJ&&7~0K2%Nx!L?h?0%B`n4SWCir;wH`BYDtGYxidpkX;A8h*23CXa!WPzPv@<}r*7 z4-6nk>6Zm$dq|RHmYDgQ*Qg!axi@7-KRBq2AK&a2Y_@%rJx(IW(OUIy9XVIy9X_hjz5rb zDnx+r=`EoYU3ER!GXlO76`!06?Glt8Bw3JQ4!#pbHOExY05(fW_2U9TOYLD5p+)^9 zkANJuQsf9ljt@#imxu+45>OB@f<8>W;R)u=I4&|3yOSn3PoL;^#t^cjJ%~8$s#2x`@#n= z;3!UHaNpp_$lyMl=x~k@&ADG>_>c%0Lh#f-DtriMKxR58C_RA-bi=dwsa(EuKVEuP z1_gs>t`e|5+{}1hN(MhAJq^aU2wr+ZRy@BQUZK(=xV)6~1Wpt`mWRMFE{W$Ir>h=o_?9YMc5E2N@ z_39HG6%^?tgDrrq*KBeho)h5qhOMxye+ho$*~XCIqWLgx{$-M7>;T>_nTH&-!0gE(9bJu z>%buPjGxOFU4FKysc)rmpwq7hy1aARXg_ED*)NYrH<|8uG=}SW!E@7XPJ_<;b`?8x z=fwP$#4&YzaJ1)|InQdYe3^Ra)`DFNa=gY=g&h+Zj(z9%sQsm?sUxR?Mg%aMlGIo6 zm6C_$peHYA1>oN#hR03KbaujX{`bF)t8mes_43=pGcM!~zF5)0W}@KYMvW$gToFB>=eekz^URJY_I$GGq(jf%TLerJ;FCi)(oI=%ASjU_hh zk=YqDH+)mGC+1MZg$=#Vx|$dF-|MopUEA5$!w*H41}0pn)W0||xW*&SdTPnSuVSuR zu2^GQ>lJe8opIz<@3E!dZ>kjhT;Wo+Cj8jc?GE>YS!v!&LQ?AE)^BpY7j?K`6Zfaf z7U%cuZ@Tgksv=v_@spMr&wvWfg@ljf`N`Y~TxYR!Xlz<+5|@V_qFWWJUBS`!ughKk zb-{J-_%gfTxLs#T%YG+8MP>n~)?Hj%bM^kc8Q$ma7*?+ur1zymk*3~U?pdeV`(EWZ zl$dY2(f^AR4ykpgj2=AB?ohe=yY_bmoX#AaYgJwF?Y2F)I9K-AS9f~paBIu~>v6vG z`VD(@sj=(b;HUPs+RX0qh0lMOWqAOe{LX}J4cHpQ#HOp@ief+ea^$?4zJ^nr-}Hi&7>!T))y>0V)*{btVpxub?co! zy6R|6cyBd1(fW-0@7=$N?V9q~%sA!kYWF)unQvDwQUvzoI`p|dx@UBaz$L05b=HoiI{Q2t2{P{b|%J?-KYI_=w zYBN9Ctsv~R?ZlkuW$Yuh9Sggkn(Z}uMQl~r%s+N!bey|CPbYNW#!olzzIfO9M&>7aBf1*-J9_S4(E?sTH2cY++pVI4#sw@JH}Ui4a~}G zboxx#@8uQr2ZynACnNowrRgZmST~bj+}><+am&-3f5B_eR>ppthZj5dDmoSQXMN?U zQ@4U1UGw@{^F-h2-@GwBZNKxtv;1r8CN2MA_`0qOc4pLjPR!rQ&1$RVdUvvaU#)wo zor`Aul42F7S6T3d*|)phZde)Ab7QU8o4w*PUzMl0j~kg~V!5jSenKI-h)n;&?cX=ppvu=M#o_Fca@VC>-$7t^O5zjkSgzsbTm zA*>#|nr`-+|M;|1&nNkIh1YkewVUPhd;2LYo4G}0A=hd(s}2R#_o!!_7+JA(n)cZ_d~1ZzwhYqh!tDxw(jH1js2{9N8P!)C|7WvNlTdh)0fO*3vf8G?bDroLD%aK?l7N~4OQ=!^mIQNduRL1ZAWa@oZF!06}EQR8E#W*;atsrah_uu z-h7pPMZc@hrfqAE@fznokM^~9*6Lp~ui(6``+#Ui>v3lSOs(G~v>y{;{dxf=0-B(!pa++3$V^&5#WIMcB^5f){qnB1~sd~G2teFuho6S|< z>UOJO)IO*1QYXhfnF%*I>zA$?5E$I|or}c}uIGM=TCir;$>7Xe!;3Gk>k_p7!HkO| zE^Mm4bL#G{0~%#n6V~l4HT0MmR+tv?Zhb=EkNyW& zCiGfayYT#_((g|9FDY5~YV*+H+q=CvGo#pMRnS4rx<7vDvGGm4#q@S>#&b=}UF%-G zFDdGq8B&{@=#;SK{mAhlE1x}aHXNc?d~f!-z$ICRqpPC!FKQ@S;BzK^-D>XmnR(+n zRhre+MSBhR-PG6nY+2u5W5-|ht?A!4to_*`zj;IlPYf-aYwGS$Q$E7M`D(rA&@=io zetg`q_tFB4LV_`+bD&YmyUHMe*ReL1)3W(>j<1TeOCz;n zEZVWmf0%Y-@y1<@eW&9W-ZIOmuWEmhzjn!oWmh-{>e|?Qz9CyMw2DAKdi%ySC038b;UbF_(+3_MJYn~YzzsK^m>fzg8N zdKU`T?u9|l9LDi3QiB~mJ)wp_vGKZjx)Q2=+{G}zar)Qn^z=&y^%vUSntguTWwrcz zPdzU`>%q^S>ycG$v>H~eI76Us_@u^{m&NoM;eFCx!yBj z$Jpr$(!HM>B`q9e7iw!AY3Jm+g4d?Yz{N%9=SDZ>m3H6o{m}Z(8-5HpU3R{IV^;3E z*Q*#gC#(<0>3>sAOqWFz3V#0B-E2;hv!(IqPlE$8uYap<_ruAmTB}t*g|L1ddGO#b zcc5Z))fr4j*bJg*{t9Sfhn(4L#2`rm(i1vSX&2C^*z``ip!5VuRL~S=jxsY2G4)GR zlAf)IC|!|9iJH4e(~x!o5seDiGA1sK5|@Y=q>kI=U?oSLjE34D!QJ&_6$FH<#DWO8 zLFNN&z8DPg5Sf146#{Fqw_SCZhIktm@8~IWWGEq#;RF^=@cmF-I43|5iPr{jCJ?=| z$%oCaFNVfN_{C80ZWP>}I!~t{c~tmne5~N(MsY7z}HA?y%tI2~jtPgp$4xd)q+@f_D>f zPuu4X1}q-mB&quC*Rr5)TBK0NgFO(g+JYlvZE@iT&;Rc6uhPJBq9iE`J~8zd6AXNa zIy~5gI`m>BN-s*d2vA;L-n>vr)jAVXj|6BirPs3m^fv-Q^w$+r5}%BrycNg7bpHcqR1P@{811uXbMYCcqs zBh-ZI_rFL3QWMGlBFX;wqKJAB(MZPm=T}=*LzMAasHn{V zzm!JjHE{==wx~Ra%W%@dwGTL$Z7A(fK`g8#!IueOyB1cIO;~h&VY>vvuqM(l;41^e zh*27kqANuY*WJYNK7w`_z=c-s5h|w+xd5mS-b4QIRU$akITqw#VVTOI9KEUf;ysiA zzf(xxL*Biq(s&OzLJs!vP~}jD-l)Ci90PJ#8ZotjUT@S~b50F%NQ=IQa^mU|okKZs zYXhCr0GW|8ozsMJsNJiuLO2}6Pk`sr_}V}lIQNDhQX+Wg`l?GHAP-#G=0hI<+8o>YEpg8_#R-dgdax&Lnyd2_xho(}D|H~m^ ztdH?O#{Kx6!3ang_Ya2zFPV_BkTBj)hJ@SOGa%tQKsF>?7gz>KxDG(a==xN704w~p z0K&)hQX+Wg`l?GHAP-#G=0hI>+pK1WZVvL+I4##KtxJLpvD&RAIjPr5t1MYFa_#R_- zjN@@v1xDEz>%)skR7{TXK0d3*cbhQg$8`btlm&d{gZi%<1i!tH&-*(8;!u*Q22k_ z2z+6OzW)($5Knc;*FYqEs|7z{#ew(9@J$aMeAVTz9L7YQ+J}PF(T_N6Jk#q$@Y9#d zNS%cLFBHMUfIAPq4jf0xFIvF;0imzv}Q79e%k6za)lr9{^fN zq+~(}e%dP?Ac_w=;E!zx+fQrx+aWn@JaDL!KENTKl7ap{@?Vpu`@c|s7i8Sb|Nj6? C@QM!r literal 0 HcmV?d00001 diff --git a/initATLASAufschubkonten/RoutineManager.vbproj b/initATLASAufschubkonten/RoutineManager.vbproj index 81da28f..508c737 100644 --- a/initATLASAufschubkonten/RoutineManager.vbproj +++ b/initATLASAufschubkonten/RoutineManager.vbproj @@ -267,6 +267,9 @@ + + Always + diff --git a/initATLASAufschubkonten/cBuergschaften.vb b/initATLASAufschubkonten/cBuergschaften.vb index 0b218c2..6d2ddaf 100644 --- a/initATLASAufschubkonten/cBuergschaften.vb +++ b/initATLASAufschubkonten/cBuergschaften.vb @@ -154,6 +154,7 @@ Public Class cBuergschaften Dim dr As SqlDataReader Dim sql As String = "SELECT * FROM ezoll.dbo.vwVERAG_Zolaris_EZoll_NCTS_Datenübernahme" If Not history Then sql &= " WHERE [AnmeldungsDatum] > DATEADD(DAY, - 10, GETDATE()) AND CRN is not null " 'letzten 10 Tage + If history Then sql &= " WHERE [AnmeldungsDatum] > DATEADD(MONTH, - 6, GETDATE()) AND CRN is not null " 'letzten 6 Monate Dim sqlConn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionEZOLL ' setLabel(frmAtlasAufschub.lbBrgAtlasSuben, "einlesen ...") diff --git a/initATLASAufschubkonten/frmStartOptions.Designer.vb b/initATLASAufschubkonten/frmStartOptions.Designer.vb index c24d152..ce34d3c 100644 --- a/initATLASAufschubkonten/frmStartOptions.Designer.vb +++ b/initATLASAufschubkonten/frmStartOptions.Designer.vb @@ -25,6 +25,11 @@ Partial Class frmStartOptions Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStartOptions)) Me.pnl = New System.Windows.Forms.Panel() + Me.Button14 = New System.Windows.Forms.Button() + Me.Label20 = New System.Windows.Forms.Label() + Me.Label19 = New System.Windows.Forms.Label() + Me.Label18 = New System.Windows.Forms.Label() + Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() Me.LinkLabel36 = New System.Windows.Forms.LinkLabel() Me.Button13 = New System.Windows.Forms.Button() Me.Button12 = New System.Windows.Forms.Button() @@ -52,6 +57,7 @@ Partial Class frmStartOptions Me.CheckBox3 = New System.Windows.Forms.CheckBox() Me.tbcntr = New System.Windows.Forms.TabControl() Me.TabPage1 = New System.Windows.Forms.TabPage() + Me.Button15 = New System.Windows.Forms.Button() Me.Button8 = New System.Windows.Forms.Button() Me.LinkLabel28 = New System.Windows.Forms.LinkLabel() Me.LinkLabel4 = New System.Windows.Forms.LinkLabel() @@ -149,9 +155,7 @@ Partial Class frmStartOptions Me.LinkLabel3 = New System.Windows.Forms.LinkLabel() Me.lklAufschubkontenATLASEZOLL = New System.Windows.Forms.LinkLabel() Me.lblRoutineManager = New System.Windows.Forms.Label() - Me.MyTextBox2 = New VERAG_PROG_ALLGEMEIN.MyTextBox() - Me.Label18 = New System.Windows.Forms.Label() - Me.Label19 = New System.Windows.Forms.Label() + Me.Button16 = New System.Windows.Forms.Button() Me.pnl.SuspendLayout() CType(Me.piceZollAnh, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbcntr.SuspendLayout() @@ -181,6 +185,9 @@ Partial Class frmStartOptions ' Me.pnl.BackColor = System.Drawing.Color.White Me.pnl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnl.Controls.Add(Me.Button16) + Me.pnl.Controls.Add(Me.Button14) + Me.pnl.Controls.Add(Me.Label20) Me.pnl.Controls.Add(Me.Label19) Me.pnl.Controls.Add(Me.Label18) Me.pnl.Controls.Add(Me.MyTextBox2) @@ -239,6 +246,68 @@ Partial Class frmStartOptions Me.pnl.Size = New System.Drawing.Size(861, 827) Me.pnl.TabIndex = 0 ' + 'Button14 + ' + Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button14.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button14.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button14.Location = New System.Drawing.Point(268, 340) + Me.Button14.Name = "Button14" + Me.Button14.Size = New System.Drawing.Size(143, 24) + Me.Button14.TabIndex = 67 + Me.Button14.Text = "Buchungen LDV --> BMD" + Me.Button14.UseVisualStyleBackColor = True + ' + 'Label20 + ' + Me.Label20.AutoSize = True + 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.Location = New System.Drawing.Point(265, 324) + Me.Label20.Name = "Label20" + Me.Label20.Size = New System.Drawing.Size(146, 13) + Me.Label20.TabIndex = 66 + Me.Label20.Text = "Routine Manager AWOR" + ' + 'Label19 + ' + Me.Label19.AutoSize = True + Me.Label19.Location = New System.Drawing.Point(205, 155) + Me.Label19.Name = "Label19" + Me.Label19.Size = New System.Drawing.Size(67, 13) + Me.Label19.TabIndex = 65 + Me.Label19.Text = "Tage zurück" + ' + 'Label18 + ' + Me.Label18.AutoSize = True + Me.Label18.Location = New System.Drawing.Point(206, 135) + Me.Label18.Name = "Label18" + Me.Label18.Size = New System.Drawing.Size(27, 13) + Me.Label18.TabIndex = 64 + Me.Label18.Text = "Max" + ' + 'MyTextBox2 + ' + Me.MyTextBox2._DateTimeOnly = False + Me.MyTextBox2._numbersOnly = True + Me.MyTextBox2._numbersOnlyKommastellen = "" + Me.MyTextBox2._Prozent = False + Me.MyTextBox2._ShortDateNew = False + Me.MyTextBox2._ShortDateOnly = False + Me.MyTextBox2._TimeOnly = False + Me.MyTextBox2._TimeOnly_Seconds = False + Me.MyTextBox2._value = "" + Me.MyTextBox2._Waehrung = False + Me.MyTextBox2._WaehrungZeichen = True + Me.MyTextBox2.ForeColor = System.Drawing.Color.Red + Me.MyTextBox2.Location = New System.Drawing.Point(151, 152) + Me.MyTextBox2.MaxLineLength = -1 + Me.MyTextBox2.MaxLines_Warning = "" + Me.MyTextBox2.MaxLines_Warning_Label = Nothing + Me.MyTextBox2.Name = "MyTextBox2" + Me.MyTextBox2.Size = New System.Drawing.Size(53, 20) + Me.MyTextBox2.TabIndex = 63 + ' 'LinkLabel36 ' Me.LinkLabel36.AutoSize = True @@ -294,6 +363,7 @@ Partial Class frmStartOptions Me.txtSyskaWdhDateiname._ShortDateNew = False Me.txtSyskaWdhDateiname._ShortDateOnly = False Me.txtSyskaWdhDateiname._TimeOnly = False + Me.txtSyskaWdhDateiname._TimeOnly_Seconds = False Me.txtSyskaWdhDateiname._value = "" Me.txtSyskaWdhDateiname._Waehrung = False Me.txtSyskaWdhDateiname._WaehrungZeichen = True @@ -340,6 +410,7 @@ Partial Class frmStartOptions Me.txtEZOLLAnhDat._ShortDateNew = True Me.txtEZOLLAnhDat._ShortDateOnly = False Me.txtEZOLLAnhDat._TimeOnly = False + Me.txtEZOLLAnhDat._TimeOnly_Seconds = False Me.txtEZOLLAnhDat._value = "" Me.txtEZOLLAnhDat._Waehrung = False Me.txtEZOLLAnhDat._WaehrungZeichen = True @@ -560,6 +631,7 @@ Partial Class frmStartOptions ' 'TabPage1 ' + Me.TabPage1.Controls.Add(Me.Button15) Me.TabPage1.Controls.Add(Me.Button8) Me.TabPage1.Controls.Add(Me.LinkLabel28) Me.TabPage1.Controls.Add(Me.LinkLabel4) @@ -596,12 +668,24 @@ Partial Class frmStartOptions Me.TabPage1.Controls.Add(Me.PictureBox8) Me.TabPage1.Location = New System.Drawing.Point(4, 22) Me.TabPage1.Name = "TabPage1" - Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) + Me.TabPage1.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) Me.TabPage1.Size = New System.Drawing.Size(851, 395) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Zollverfahren" Me.TabPage1.UseVisualStyleBackColor = True ' + 'Button15 + ' + Me.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button15.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button15.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button15.Location = New System.Drawing.Point(581, 250) + Me.Button15.Name = "Button15" + Me.Button15.Size = New System.Drawing.Size(211, 24) + Me.Button15.TabIndex = 56 + Me.Button15.Text = "MIC NCTS Imort (aus Pfad)" + Me.Button15.UseVisualStyleBackColor = True + ' 'Button8 ' Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat @@ -1006,8 +1090,8 @@ Partial Class frmStartOptions Me.TabPage2.Controls.Add(Me.txtVRGOut_BezugsNr) Me.TabPage2.Location = New System.Drawing.Point(4, 22) Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(851, 395) + Me.TabPage2.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.TabPage2.Size = New System.Drawing.Size(852, 395) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "VERAG Interface" Me.TabPage2.UseVisualStyleBackColor = True @@ -1254,6 +1338,7 @@ Partial Class frmStartOptions Me.dgvMRN.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.clmnMRN}) Me.dgvMRN.Location = New System.Drawing.Point(637, 63) Me.dgvMRN.Name = "dgvMRN" + Me.dgvMRN.RowHeadersWidth = 62 Me.dgvMRN.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect Me.dgvMRN.Size = New System.Drawing.Size(207, 134) Me.dgvMRN.TabIndex = 75 @@ -1262,6 +1347,7 @@ Partial Class frmStartOptions ' Me.clmnMRN.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill Me.clmnMRN.HeaderText = "MRN" + Me.clmnMRN.MinimumWidth = 8 Me.clmnMRN.Name = "clmnMRN" ' 'txtVRGOut_MRN @@ -1273,6 +1359,7 @@ Partial Class frmStartOptions Me.txtVRGOut_MRN._ShortDateNew = False Me.txtVRGOut_MRN._ShortDateOnly = False Me.txtVRGOut_MRN._TimeOnly = False + Me.txtVRGOut_MRN._TimeOnly_Seconds = False Me.txtVRGOut_MRN._value = "" Me.txtVRGOut_MRN._Waehrung = False Me.txtVRGOut_MRN._WaehrungZeichen = False @@ -1294,6 +1381,7 @@ Partial Class frmStartOptions Me.txtVRGOut_FilialenNr._ShortDateNew = False Me.txtVRGOut_FilialenNr._ShortDateOnly = False Me.txtVRGOut_FilialenNr._TimeOnly = False + Me.txtVRGOut_FilialenNr._TimeOnly_Seconds = False Me.txtVRGOut_FilialenNr._value = "" Me.txtVRGOut_FilialenNr._Waehrung = False Me.txtVRGOut_FilialenNr._WaehrungZeichen = False @@ -1316,6 +1404,7 @@ Partial Class frmStartOptions Me.txtVRGOut_AbfertigungsNr._ShortDateNew = False Me.txtVRGOut_AbfertigungsNr._ShortDateOnly = False Me.txtVRGOut_AbfertigungsNr._TimeOnly = False + Me.txtVRGOut_AbfertigungsNr._TimeOnly_Seconds = False Me.txtVRGOut_AbfertigungsNr._value = "" Me.txtVRGOut_AbfertigungsNr._Waehrung = False Me.txtVRGOut_AbfertigungsNr._WaehrungZeichen = False @@ -1349,6 +1438,7 @@ Partial Class frmStartOptions Me.txtVRGOutEZA_BezugsNr._ShortDateNew = False Me.txtVRGOutEZA_BezugsNr._ShortDateOnly = False Me.txtVRGOutEZA_BezugsNr._TimeOnly = False + Me.txtVRGOutEZA_BezugsNr._TimeOnly_Seconds = False Me.txtVRGOutEZA_BezugsNr._value = "" Me.txtVRGOutEZA_BezugsNr._Waehrung = False Me.txtVRGOutEZA_BezugsNr._WaehrungZeichen = False @@ -1382,6 +1472,7 @@ Partial Class frmStartOptions Me.txtVRGOut_BezugsNr._ShortDateNew = False Me.txtVRGOut_BezugsNr._ShortDateOnly = False Me.txtVRGOut_BezugsNr._TimeOnly = False + Me.txtVRGOut_BezugsNr._TimeOnly_Seconds = False Me.txtVRGOut_BezugsNr._value = "" Me.txtVRGOut_BezugsNr._Waehrung = False Me.txtVRGOut_BezugsNr._WaehrungZeichen = False @@ -1406,7 +1497,7 @@ Partial Class frmStartOptions Me.TabPage3.Controls.Add(Me.Label11) Me.TabPage3.Location = New System.Drawing.Point(4, 22) Me.TabPage3.Name = "TabPage3" - Me.TabPage3.Size = New System.Drawing.Size(851, 395) + Me.TabPage3.Size = New System.Drawing.Size(852, 395) Me.TabPage3.TabIndex = 2 Me.TabPage3.Text = "Partner-Systeme" Me.TabPage3.UseVisualStyleBackColor = True @@ -1582,6 +1673,7 @@ Partial Class frmStartOptions Me.MyTextBox1._ShortDateNew = False Me.MyTextBox1._ShortDateOnly = False Me.MyTextBox1._TimeOnly = False + Me.MyTextBox1._TimeOnly_Seconds = False Me.MyTextBox1._value = "100000" Me.MyTextBox1._Waehrung = False Me.MyTextBox1._WaehrungZeichen = True @@ -1701,7 +1793,7 @@ Partial Class frmStartOptions Me.btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btn.ForeColor = System.Drawing.Color.White - Me.btn.Location = New System.Drawing.Point(785, -1) + Me.btn.Location = New System.Drawing.Point(786, -1) Me.btn.Margin = New System.Windows.Forms.Padding(0) Me.btn.Name = "btn" Me.btn.Size = New System.Drawing.Size(75, 22) @@ -1763,44 +1855,17 @@ Partial Class frmStartOptions Me.lblRoutineManager.TabIndex = 1 Me.lblRoutineManager.Text = "Routine Manager" ' - 'MyTextBox2 + 'Button16 ' - Me.MyTextBox2._DateTimeOnly = False - Me.MyTextBox2._numbersOnly = True - Me.MyTextBox2._numbersOnlyKommastellen = "" - Me.MyTextBox2._Prozent = False - Me.MyTextBox2._ShortDateNew = False - Me.MyTextBox2._ShortDateOnly = False - Me.MyTextBox2._TimeOnly = False - Me.MyTextBox2._value = "" - Me.MyTextBox2._Waehrung = False - Me.MyTextBox2._WaehrungZeichen = True - Me.MyTextBox2.ForeColor = System.Drawing.Color.Red - Me.MyTextBox2.Location = New System.Drawing.Point(151, 152) - Me.MyTextBox2.MaxLineLength = -1 - Me.MyTextBox2.MaxLines_Warning = "" - Me.MyTextBox2.MaxLines_Warning_Label = Nothing - Me.MyTextBox2.Name = "MyTextBox2" - Me.MyTextBox2.Size = New System.Drawing.Size(53, 20) - Me.MyTextBox2.TabIndex = 63 - ' - 'Label18 - ' - Me.Label18.AutoSize = True - Me.Label18.Location = New System.Drawing.Point(206, 135) - Me.Label18.Name = "Label18" - Me.Label18.Size = New System.Drawing.Size(27, 13) - Me.Label18.TabIndex = 64 - Me.Label18.Text = "Max" - ' - 'Label19 - ' - Me.Label19.AutoSize = True - Me.Label19.Location = New System.Drawing.Point(205, 155) - Me.Label19.Name = "Label19" - Me.Label19.Size = New System.Drawing.Size(67, 13) - Me.Label19.TabIndex = 65 - Me.Label19.Text = "Tage zurück" + Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button16.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(54, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.Button16.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.Button16.Location = New System.Drawing.Point(559, 182) + Me.Button16.Name = "Button16" + Me.Button16.Size = New System.Drawing.Size(211, 24) + Me.Button16.TabIndex = 57 + Me.Button16.Text = "MAIL_ATTACH_WORK_FILES" + Me.Button16.UseVisualStyleBackColor = True ' 'frmStartOptions ' @@ -1973,4 +2038,8 @@ Partial Class frmStartOptions Friend WithEvents Label19 As Label Friend WithEvents Label18 As Label Friend WithEvents MyTextBox2 As VERAG_PROG_ALLGEMEIN.MyTextBox + Friend WithEvents Button14 As Button + Friend WithEvents Label20 As Label + Friend WithEvents Button15 As Button + Friend WithEvents Button16 As Button End Class diff --git a/initATLASAufschubkonten/frmStartOptions.resx b/initATLASAufschubkonten/frmStartOptions.resx index 531b209..5eab5b7 100644 --- a/initATLASAufschubkonten/frmStartOptions.resx +++ b/initATLASAufschubkonten/frmStartOptions.resx @@ -140,102 +140,6 @@ WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj - oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB - QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC - j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ - VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox - XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf - 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe - VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh - 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A - pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin - lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS - d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp - hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ - LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs - 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ - NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P - ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x - WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ - nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de - CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= @@ -476,6 +380,102 @@ WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAABEhJREFUSEtj + oDZg4WThlrSSdLPOtc53zHaMl5SUZGBnZ4fKUhMwMjCK6IloGhUYZdn32a/wX+Z/0Ge2z0L9eH0rQVVB + QSZ2JqhCKgEBNQFFoyKjnPAj4cdjz8d+jb8U/z/iaMR9z2WeE3XSdByEdYWFGVkYGaHKKQdWTVYF4YfC + j8VdjPsHwiALYezo89HTzWrNHNj42VigyikHDv0OC2POxrwDWYSOgZY+DNoRNMV5urMdVDn5gFOUU0rJ + VynOd7XvBSwW/QHiHx4LPPYDQ6DUpMzEEKqNPMDKw8on5ywXBHT9w+hT0d/QLPsefTr6Rei+0Iuqwaox + XGJcElBt5AMFT4UIYDBtjzkT8zPuQtxfNAuv+G/wn6CdoG3Bp8AnysjMSH78MXMyc0tZSbnZtNksDtsf + 9hJoODiRgC26EPcD6IDbPit9Oo3yjWz4Ffm5gXmTGaqVPMAuwC6il6ZXgx5vsedif4YfDH/kNsdtIlDe + VlRflDo5HpeFkUcj33jM89gqbigux8bNBlVNIeCR4pFX9ldO8F7qfTLyWORHmGUx52N+2/XYrRTRFTFh + 42PjAMYZVAcOwMzBzA2MXHUFDwVLGXsZDS4JLjZ0TeyC7CLghDLVeWvU8ahPyL7z3+u/STNdMwSqFD8A + pSBeOV41rTitYr/1ftNd57jmKnorygKDjpUBqQgU1BA0NKsym4JsESifAfFzyxmWXhKeEqxQpfgBpxin + lEqgSnLI3pBn0Wei30aeiNzlucQzWdxEXBKY1+DJGYeF12IuxBTJe8srsfAQkfKBQckFzJgp7vPdD4KS + d9ylOJAhL4AF73aHCQ5RwKpGjomViZWVl1VAP0u/wXeN70WYZbEXYi/7b/Lv0c3Q1eGR5eGBGokfKLgp + hALjZBuyq0EYaOkHoIErzWvN/cWMxSSAcSoLTO57oXK/gPhp4PbAqUAfO7MLsbMBHUVcTQD2FVLGRbIQ + LA5MfdNdZrnYolkIcswSs0ozL2Aw80KNIg5I20h7ApN5lGWdZQfQoPtAA8F1GZLFD4HVznGQZUD6NUgs + 8kjka5t2m25pW2kzFm4yShFgvuGVMJEwNq0wrXSd6bopeGfwA2RLkTHIUrfZbnvkXOWCQYkNagT5QNZZ + NsCu225Z9MnoD8By8TfQEkQ5eTHuJzDRHAMmnkJ2EXYhqBbKADCIeIGZ29t9nvvSqJNRL4AW/UKy8L7P + ap8Juum6BsBCgHotI25JbgkZBxkHtVC1JGDc7Qa2UX4CE8n3oJ1B64GpMlpYR5ifmZ2Zyq0iKFANUk3x + WOhxEFgYvLZus64EJhQtqBTtALDEsQ/aHnRf3FTcASpEWwBsbQkBLQW1uqiTUJABFxcXg7y8PJupqSm/ + nZ2diL29vSgyBooJm5ub88nKyrIC1VLezgQ2zRk9PT0F6urqVCdNmmQwbdo0Y2Q8efJk3ebmZkVXV1de + CQkJEjM9AwMAOTMC2xlgxuQAAAAASUVORK5CYII= diff --git a/initATLASAufschubkonten/frmStartOptions.vb b/initATLASAufschubkonten/frmStartOptions.vb index eab53ea..12dc79c 100644 --- a/initATLASAufschubkonten/frmStartOptions.vb +++ b/initATLASAufschubkonten/frmStartOptions.vb @@ -72,7 +72,7 @@ Public Class frmStartOptions txtEZOLLAnhDat._value = Now.ToShortDateString - Dim PARAM = "INSERT_BENACHRICHTIGUNG_VERMERKE_TEAMS" + Dim PARAM = "" 'INSERT_BENACHRICHTIGUNG_VERMERKE_TEAMS Dim parameter() As String = Environment.GetCommandLineArgs().ToArray If (parameter.Count - 1) >= 1 Then 'Höher als 1 weil der index 0 der Pfad zum programm ist PARAM = parameter(1) @@ -220,6 +220,12 @@ Public Class frmStartOptions VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False getUID_Pruefung(MyTextBox1.Text) closeMe() + Case "WOELFL_USTVAntraege" + Dim f As New frmInfo(PARAM) + f.Show() + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + sendWOELFL_USTVAntraege("al@verag.ag") + closeMe() Case "SDL_GUELTISBIS" Dim f As New frmInfo(PARAM) f.Show() @@ -252,12 +258,23 @@ Public Class frmStartOptions End If closeMe() + Case "MAIL_ATTACH_WORK_FILES" + + Dim f As New frmInfo(PARAM) + f.Show() + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + doIDSPlatts() + doExcelImportNCTS_FREMD() + + closeMe() + Case "ezoll_anhaenge" Dim f As New frmInfo(PARAM) f.Show() VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False importFileFromEZOLL(Now) + closeMe() @@ -330,6 +347,13 @@ Public Class frmStartOptions VERAG_PROG_ALLGEMEIN.cBMD_Interface.genDatensatzCSV_ALL(False, False) 'Kunden noch nicht closeMe() '------------------------------ + Case "AWOR_LDV_to_BMD" + Dim f As New frmInfo(PARAM) + f.Show() + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + VERAG_PROG_ALLGEMEIN.cLDV_Interface.copyLDV_BMD() + closeMe() + '------------------------------ Case Else 'Nur bei manuellem Start wird der fehler ausgegeben VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW @@ -506,6 +530,21 @@ Public Class frmStartOptions ' End Try 'End Sub + Function getStandortTXT(AVISO) As String + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + If AVISO IsNot Nothing Then + + If AVISO.Grenzstelle.Replace("???", "") = "" Then + Return SQL.getValueTxtBySql("SELECT basncd_dstnr +' - ' + [basncd_name] FROM basncd WHERE basncd_dstnr='" & If(AVISO.Zollstelle, "") & "' ", "ATLAS") + Else + Dim GRZ As New VERAG_PROG_ALLGEMEIN.cGrenzstelle(AVISO.Grenzstelle) + If GRZ IsNot Nothing AndAlso GRZ.hasEntry Then + Return If(GRZ.grz_ZollamtDST, "") & " " & If(GRZ.grz_ZollamtBezeichnung, "") + End If + End If + End If + Return "" + End Function Sub sendMailZollbeleg(pfad As String, KundenNr As Integer, art As String, ByRef list As List(Of Integer), BezugsNr As String, SND As VERAG_PROG_ALLGEMEIN.cSendungen, KdAtrNr As Object) Try If KundenNr > 0 Then @@ -517,7 +556,32 @@ Public Class frmStartOptions Dim KD_ERW As New VERAG_PROG_ALLGEMEIN.cKundenErweitert(KundenNr) If KD_ERW IsNot Nothing AndAlso KD IsNot Nothing Then ' AndAlso KD.EmailFreigabe Then - If KD_ERW.EmailFreigabe_Art = "BLG" Or KD_ERW.EmailFreigabe_Export_Art = "BLG" Or (art = "AVM" And KD_ERW.Email_AVM) Or (art = "ABD" And (KD_ERW.EmailFreigabe_ABDPDF Or KD_ERW.EmailFreigabe_Export_Art = "BLG")) Or art = "ZNV" Then ' Bei AVM ist es immer nach Freigabe, auch ZNV + + + Dim AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(SND.tblSnd_AvisoID) + 'Wenn Freigabe-Mail aktiv und Steuerbescheid oder VBD gewählt, soll bei Fremdgrenzen die BelegMail gesendet werden. + Dim sendMailFremdgrenze = False + If KD_ERW.EmailFreigabe_Art = "FG" Then + If KD_ERW.EmailFreigabe_SteuerbescheidPDF Or KD_ERW.EmailFreigabe_VBDPDF Then + + If AVISO IsNot Nothing Then + 'Fremdgrenze + If AVISO.Grenzstelle = "???" Then + sendMailFremdgrenze = True + Else + 'Prüfen ob WO oder ZA + Dim GRZ As New VERAG_PROG_ALLGEMEIN.cGrenzstelle(AVISO.Grenzstelle) + If GRZ IsNot Nothing AndAlso GRZ.hasEntry Then + If GRZ.grz_Zollamt Then sendMailFremdgrenze = True '--> Mail bei Beleg + If GRZ.grz_Warenort Then sendMailFremdgrenze = True '--> Mail bei Beleg + End If + End If + End If + End If + End If + + + If sendMailFremdgrenze Or KD_ERW.EmailFreigabe_Art = "BLG" Or KD_ERW.EmailFreigabe_Export_Art = "BLG" Or (art = "AVM" And KD_ERW.Email_AVM) Or (art = "ABD" And (KD_ERW.EmailFreigabe_ABDPDF Or KD_ERW.EmailFreigabe_Export_Art = "BLG")) Or art = "ZNV" Then ' Bei AVM ist es immer nach Freigabe, auch ZNV Dim Standort = "SUB" Select Case SND.FilialenNr Case "5501" : Standort = "IMX" @@ -549,11 +613,13 @@ Public Class frmStartOptions Dim betreff = cStandort.eMail_Zollbeleg_Betreff '"Zollbeleg" - betreff = betreff.Replace("%LKW%", "") + betreff = betreff.Replace("%LKW%", AVISO.LKW_Nr) + betreff = betreff.Replace("%AbfertigungsNr%", SND.FilialenNr & "/" & SND.AbfertigungsNr) betreff = betreff.Replace("%Standort%", "") betreff = betreff.Replace("%Uhrzeit%", "") betreff = betreff.Replace("%KdAuftrNr%", If(KdAtrNr IsNot Nothing AndAlso KdAtrNr.ToString.Trim <> "", "Ihre Auftragsnr: " & KdAtrNr, "")) + Dim body = cStandort.eMail_Zollbeleg_Text @@ -568,11 +634,11 @@ Public Class frmStartOptions Case "AVM", "ABD" 'Export Mail_Art = 4 ' Freigabe Export - If EMails_BCC = "" Then - EMails_BCC = "al@verag.ag" - Else - EMails_BCC &= ";al@verag.ag" - End If + 'If EMails_BCC = "" Then + ' EMails_BCC = "al@verag.ag" + 'Else + ' EMails_BCC &= ";al@verag.ag" + 'End If Case Else Mail_Art = 2 End Select @@ -582,10 +648,20 @@ Public Class frmStartOptions End Select + + VERAG_PROG_ALLGEMEIN.cEmailBenachrichtigung.eMails_einlesen(KundenNr, Mail_Art, EMails, EMails_CC, EMails_BCC, Emails_list_sent) ' body = body.Replace("%Platzhalter%", "E-Mails: " & EMails & " CC: " & EMails_CC & " BCC:" & EMails_BCC) body = body.Replace("%Platzhalter%", "") + body = body.Replace("%LKW%", AVISO.LKW_Nr) + body = body.Replace("%AbfertigungsNr%", SND.FilialenNr & "/" & SND.AbfertigungsNr) + body = body.Replace("%Standort%", getStandortTXT(AVISO)) + body = body.Replace("%Uhrzeit%", Now.ToShortDateString & " " & Now.ToShortTimeString & " Uhr") + body = body.Replace("%KdAuftrNr%", If(KdAtrNr IsNot Nothing AndAlso KdAtrNr.ToString.Trim <> "", "Ihre Auftragsnr: " & KdAtrNr, "")) + + + ''!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -607,70 +683,70 @@ Public Class frmStartOptions Dim API = VERAG_PROG_ALLGEMEIN.cAPI.INSERT_API(VERAG_PROG_ALLGEMEIN.cAPI_INOUT.OUT, VERAG_PROG_ALLGEMEIN.cAPI_Type.MAIL, VERAG_PROG_ALLGEMEIN.cAPI_ART.AVISO_OUT_BELEGMAIL, art,,, KundenNr, SND.tblSnd_AvisoID, SND.tblSnd_SendungID, SND.FilialenNr, SND.AbfertigungsNr) - API.api_EMail = EMails - API.api_EMailCC = EMails_CC - API.api_EMailBCC = EMails_BCC - API.api_EMailSubject = betreff - API.api_EMailText = body - API.api_EMailAttCnt = pfadList.Count + API.api_EMail = EMails + API.api_EMailCC = EMails_CC + API.api_EMailBCC = EMails_BCC + API.api_EMailSubject = betreff + API.api_EMailText = body + API.api_EMailAttCnt = pfadList.Count - Select Case art - Case "STB" - If KD_ERW.EmailFreigabe_SteuerbescheidPDF Then - betreff = betreff.Replace("%Zollbeleg%", "Abgabenbescheid " & BezugsNr) - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then - API.UPDTAE_OK() - insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46) - Else - API.UPDTAE_ERR() + Select Case art + Case "STB" + If KD_ERW.EmailFreigabe_SteuerbescheidPDF Then + betreff = betreff.Replace("%Zollbeleg%", "Abgabenbescheid " & BezugsNr) + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then + API.UPDTAE_OK() + insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46) + Else + API.UPDTAE_ERR() + End If End If - End If - Case "VBD" - If (KD_ERW.EmailFreigabe_Export And KD_ERW.EmailFreigabe_Export_Art = "BLG") Or KD_ERW.EmailFreigabe_VBDPDF Then - betreff = betreff.Replace("%Zollbeleg%", "Versandbegleitdokument " & BezugsNr) - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then - API.UPDTAE_OK() - insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46) - Else - API.UPDTAE_ERR() + Case "VBD" + If (KD_ERW.EmailFreigabe_Export And KD_ERW.EmailFreigabe_Export_Art = "BLG") Or KD_ERW.EmailFreigabe_VBDPDF Then + betreff = betreff.Replace("%Zollbeleg%", "Versandbegleitdokument " & BezugsNr) + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then + API.UPDTAE_OK() + insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46) + Else + API.UPDTAE_ERR() + End If End If - End If - Case "ZNV" - If KD_ERW.EmailFreigabe_SteuerbescheidPDF Then - betreff = betreff.Replace("%Zollbeleg%", "Abgabenbescheid ZNV " & BezugsNr) - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then - API.UPDTAE_OK() - insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46) - Else - API.UPDTAE_ERR() + Case "ZNV" + If KD_ERW.EmailFreigabe_SteuerbescheidPDF Then + betreff = betreff.Replace("%Zollbeleg%", "Abgabenbescheid ZNV " & BezugsNr) + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then + API.UPDTAE_OK() + insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46) + Else + API.UPDTAE_ERR() + End If End If - End If - Case "ABD" - If KD_ERW.EmailFreigabe_Export Or KD_ERW.EmailFreigabe_ABDPDF Then - betreff = betreff.Replace("%Zollbeleg%", "Ausfuhrbegleitdokument " & BezugsNr) - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then - API.UPDTAE_OK() - insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46) - Else - API.UPDTAE_ERR() + Case "ABD" + If KD_ERW.EmailFreigabe_Export Or KD_ERW.EmailFreigabe_ABDPDF Then + betreff = betreff.Replace("%Zollbeleg%", "Ausfuhrbegleitdokument " & BezugsNr) + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then + API.UPDTAE_OK() + insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46) + Else + API.UPDTAE_ERR() + End If End If - End If - Case "AVM" - If KD_ERW.EmailFreigabe_Export Or KD_ERW.Email_AVM Then - betreff = betreff.Replace("%Zollbeleg%", "Ausgangsvermerk " & BezugsNr) - If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then - API.UPDTAE_OK() - insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46) - Else - API.UPDTAE_ERR() + Case "AVM" + If KD_ERW.EmailFreigabe_Export Or KD_ERW.Email_AVM Then + betreff = betreff.Replace("%Zollbeleg%", "Ausgangsvermerk " & BezugsNr) + If VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(EMails, betreff, body, getAbsenderEmail(FirmaTmp), False, False, EMails_CC, EMails_BCC, pfadList) Then + API.UPDTAE_OK() + insertSendungsVermerk(SND.tblSnd_SendungID, SND.tblSnd_AvisoID, "Zollbeleg '" & art & "' gesendet an: " & EMails, 46) + Else + API.UPDTAE_ERR() + End If End If - End If - End Select + End Select + End If End If End If - End If End If Catch ex As Exception VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) @@ -867,13 +943,14 @@ Public Class frmStartOptions End If ElseIf betreff = "Report nctsTransDeclGuarantees generated successfully" Then - Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\NCTS_XLS\" & Now.Year & "\" + ' Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\NCTS_XLS\" & Now.Year & "\" + Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\NCTS_XLS\NEW\" If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD) Dim destFull = "" moveFile(pfad, ZIEL_PFAD, destFull) - doExcelImportNCTS_FREMD(destFull) + End If @@ -901,20 +978,166 @@ Public Class frmStartOptions If betreff.contains("IDSPRD: Platts Price Report") Then - Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "IDS\IDS_XLS\Platts_Price_Report\" & Now.Year & "\" + Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "IDS\IDS_XLS\Platts_Price_Report\NEW\" If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD) Dim destFull = "" moveFile(pfad, ZIEL_PFAD, destFull) - Dim Excel1 As Object 'New Microsoft.Office.Interop.Excel.Application - Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet - Excel1 = CreateObject("Excel.Application") - Dim txt As String - Dim Datei As Object 'as WorkBook - ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(destFull, "00", System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + End If - Dim DT_PLATTS As New DataTable() + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + End Try + + End Sub + 'Sub importFileFromIDSMailAnhang(pfad, betreff) + + ' Try + ' Dim sql As New VERAG_PROG_ALLGEMEIN.SQL + ' Dim DS As VERAG_PROG_ALLGEMEIN.cDATENSERVER = Nothing + + ' If betreff.contains("IDSPRD: Platts Price Report") Then + + ' Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "IDS\IDS_XLS\Platts_Price_Report\" & Now.Year & "\" + ' If Not IO.Directory.Exists(ZIEL_PFAD) Then IO.Directory.CreateDirectory(ZIEL_PFAD) + + ' Dim destFull = "" + ' moveFile(pfad, ZIEL_PFAD, destFull) + + ' Dim Excel1 As Object 'New Microsoft.Office.Interop.Excel.Application + ' Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet + ' Excel1 = CreateObject("Excel.Application") + ' Dim txt As String + ' Dim Datei As Object 'as WorkBook + ' ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(destFull, "00", System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + + ' Dim DT_PLATTS As New DataTable() + + ' DT_PLATTS.Columns.Add("IsoCode") + ' DT_PLATTS.Columns.Add("Outlet") + ' DT_PLATTS.Columns.Add("Group Description") + ' DT_PLATTS.Columns.Add("Product") + ' DT_PLATTS.Columns.Add("Price Period Start") + ' DT_PLATTS.Columns.Add("Price Period End") + ' DT_PLATTS.Columns.Add("Excise") + ' DT_PLATTS.Columns.Add("Netprice") + ' DT_PLATTS.Columns.Add("Currency") + ' Try + ' destFull = "\\datenarchiv.verag.ost.dmn\DATENARCHIV\IDS\IDS_XLS\Platts_Price_Report\2022\PLATTSPR_707156_0000167908_1_20032022063012.xls" + + ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TEST 1OOO " & destFull, "*AUTO*",,,,,, ) + + ' With Excel1 + ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TEST 1.1", "*AUTO*",,,,,, ) + ' Try + + ' Datei = .Workbooks.Open(destFull,, True) 'Anpassen + ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TEST 1.2", "*AUTO*",,,,,, ) + + ' Catch ex As Exception + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + ' MsgBox(ex.Message & ex.StackTrace) + ' End Try + ' 'Try + ' ' Datei = .Workbooks.Open(destFull,, True) 'Anpassen + ' 'Catch ex As Exception + ' ' System.Threading.Thread.Sleep(5000) ' 5 Sek. warten --> noch Zugriff vom Erstellen? + ' ' Datei = .Workbooks.Open(destFull,, True) + ' 'End Try + + ' Blatt = Datei.Worksheets(1) 'Anpassen + + ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TEST 1.3", "*AUTO*",,,,,, ) + ' 'Excel1.Workbooks.Open(destFull) + ' 'Excel1.Visible = True ....wers braucht ? + + ' Dim zeile = 12 + ' 'txt ="" + + ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TEST 2: " & Blatt.Range("A" & zeile).Value, "*AUTO*",,,,,, ) + + ' While zeile <= 10000 AndAlso Blatt.Range("A" & zeile) IsNot Nothing AndAlso Blatt.Range("A" & zeile).Value <> "" + + ' If Blatt.Range("A" & zeile).Value.ToString.Contains("Austria") Then + + ' DT_PLATTS.Rows.Add({Blatt.Range("A" & zeile).Value, Blatt.Range("B" & zeile).Value, Blatt.Range("C" & zeile).Value, Blatt.Range("D" & zeile).Value, Blatt.Range("E" & zeile).Value, Blatt.Range("F" & zeile).Value, Blatt.Range("H" & zeile).Value, Blatt.Range("I" & zeile).Value, Blatt.Range("J" & zeile).Value}) + + + ' End If + + + + ' zeile += 1 + + ' End While + ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "zeile: " & zeile, "*AUTO*",,,,,, ) + + + ' End With + + + ' 'NEUE EXCEL GENEREITER, PREISE ANPASSEN, MAIL SENDEN + ' If DT_PLATTS.Rows.Count > 0 Then + ' Dim XLS_PAth = destFull.Replace(".xls", "_NEW.xls") + ' Dim XLS_Tmp = "" + ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(DT_PLATTS,,,,, False, XLS_Tmp) + ' If XLS_Tmp <> "" Then + ' IO.File.Move(XLS_Tmp, XLS_PAth) ' Verschiebt die Datei + + ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "IDSPRD: Platts Price Report", "*AUTO*",,,,,, {XLS_PAth}) + + ' End If + ' End If + + ' Excel1.Workbooks.Close + ' System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Excel1) + ' System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Blatt) + ' Excel1 = Nothing + ' Blatt = Nothing + ' GC.Collect() + + + ' Catch ex As Exception + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + + ' Try + ' Excel1.Workbooks.Close + ' System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Excel1) + ' System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Blatt) + ' Excel1 = Nothing + ' Blatt = Nothing + ' GC.Collect() + + ' Catch ex2 As Exception + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex2.Message, ex2.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + ' End Try + ' End Try + + ' End If + + ' Catch ex As Exception + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + ' End Try + + 'End Sub + + Function getPlattsAufschlag(outletGroug As String) As Double + If outletGroug.Contains("4473") Then Return 0.032 + If outletGroug.Contains("4474") Then Return 0.032 + If outletGroug.Contains("4486") Then Return 0.042 + Return 0.048 + End Function + Sub doIDSPlatts() + + Try + Dim sql As New VERAG_PROG_ALLGEMEIN.SQL + Dim DS As VERAG_PROG_ALLGEMEIN.cDATENSERVER = Nothing + Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "IDS\IDS_XLS\Platts_Price_Report\NEW\" + + Dim DT_PLATTS As New DataTable() + + If IO.Directory.Exists(ZIEL_PFAD) Then DT_PLATTS.Columns.Add("IsoCode") DT_PLATTS.Columns.Add("Outlet") @@ -925,77 +1148,85 @@ Public Class frmStartOptions DT_PLATTS.Columns.Add("Excise") DT_PLATTS.Columns.Add("Netprice") DT_PLATTS.Columns.Add("Currency") - Try - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TEST 1 " & destFull, "*AUTO*",,,,,, ) + DT_PLATTS.Columns.Add("NetpriceNEW") - With Excel1 - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TEST 1.1", "*AUTO*",,,,,, ) - - Datei = .Workbooks.Open(destFull,, True) 'Anpassen - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TEST 1.2", "*AUTO*",,,,,, ) - 'Try - ' Datei = .Workbooks.Open(destFull,, True) 'Anpassen - 'Catch ex As Exception - ' System.Threading.Thread.Sleep(5000) ' 5 Sek. warten --> noch Zugriff vom Erstellen? - ' Datei = .Workbooks.Open(destFull,, True) - 'End Try - - Blatt = Datei.Worksheets(1) 'Anpassen - - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TEST 1.3", "*AUTO*",,,,,, ) - 'Excel1.Workbooks.Open(destFull) - 'Excel1.Visible = True ....wers braucht ? - - Dim zeile = 12 - 'txt ="" - - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "TEST 2: " & Blatt.Range("A" & zeile), "*AUTO*",,,,,, ) - - While zeile <= 10000 AndAlso Blatt.Range("A" & zeile) IsNot Nothing AndAlso Blatt.Range("A" & zeile) <> "" - - If Blatt.Range("A" & zeile).Value.ToString.Contains("Austria") Then - - DT_PLATTS.Rows.Add({Blatt.Range("A" & zeile).Value, Blatt.Range("B" & zeile).Value, Blatt.Range("C" & zeile).Value, Blatt.Range("D" & zeile).Value, Blatt.Range("E" & zeile).Value, Blatt.Range("F" & zeile).Value, Blatt.Range("H" & zeile).Value, Blatt.Range("I" & zeile).Value, Blatt.Range("J" & zeile).Value}) + For Each IDS_FILE In IO.Directory.GetFiles(ZIEL_PFAD) - End If + '::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: + ' EXCEL AUSLESEN::::::: + '::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: + Dim FILE_NEW = IDS_FILE.Replace("\NEW\", "\" & Now.Year & "\").Replace(".xls", "_ORIG.xls") + While IO.File.Exists(FILE_NEW) + FILE_NEW = IDS_FILE.Replace("\NEW\", "\" & Now.Year & "\").Replace(".xls", Now.ToString("_ddMMyy.HHmmss") & "_ORIG.xls") + End While - zeile += 1 + IO.File.Move(IDS_FILE, FILE_NEW) + 'IDS_FILE = ZIEL_PFAD.Replace("\NEW\", "\" & Now.Year & "\").Replace(".xls", "_ORIG.xls") - End While - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "zeile: " & zeile, "*AUTO*",,,,,, ) + Dim Excel1 As Object 'New Microsoft.Office.Interop.Excel.Application + Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet + Excel1 = CreateObject("Excel.Application") + Dim txt As String + Dim Datei As Object 'as WorkBook + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(destFull, "00", System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) - End With - - - 'NEUE EXCEL GENEREITER, PREISE ANPASSEN, MAIL SENDEN - If DT_PLATTS.Rows.Count > 0 Then - Dim XLS_PAth = destFull.Replace(".xls", "_NEW.xls") - Dim XLS_Tmp = "" - VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(DT_PLATTS,,,,, False, XLS_Tmp) - If XLS_Tmp <> "" Then - IO.File.Move(XLS_Tmp, XLS_PAth) ' Verschiebt die Datei - - VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "IDSPRD: Platts Price Report", "*AUTO*",,,,,, {XLS_PAth}) - - End If - End If - - Excel1.Workbooks.Close - System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Excel1) - System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Blatt) - Excel1 = Nothing - Blatt = Nothing - GC.Collect() - - - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) - Try + + With Excel1 + Try + + Datei = .Workbooks.Open(FILE_NEW,, True) 'Anpassen + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + MsgBox(ex.Message & ex.StackTrace) + End Try + + Blatt = Datei.Worksheets(1) 'Anpassen + + 'Excel1.Workbooks.Open(destFull) + 'Excel1.Visible = True ....wers braucht ? + Dim zeile = 12 + + While zeile <= 10000 AndAlso Blatt.Range("A" & zeile) IsNot Nothing AndAlso Blatt.Range("A" & zeile).Value <> "" + + If Blatt.Range("A" & zeile).Value.ToString.Contains("Austria") Then + Dim NetpriceNEW As Double = getPlattsAufschlag(Blatt.Range("B" & zeile).Value) + If NetpriceNEW > 0 Then + NetpriceNEW += CDbl(Blatt.Range("I" & zeile).Value) ' Aufschalg + NETTO + DT_PLATTS.Rows.Add({Blatt.Range("A" & zeile).Value, Blatt.Range("B" & zeile).Value, Blatt.Range("C" & zeile).Value, Blatt.Range("D" & zeile).Value, Blatt.Range("E" & zeile).Value, Blatt.Range("F" & zeile).Value, Blatt.Range("H" & zeile).Value, Blatt.Range("I" & zeile).Value, Blatt.Range("J" & zeile).Value, NetpriceNEW}) + End If + End If + + zeile += 1 + + End While + + + End With + + ''NEUE EXCEL GENEREITER, PREISE ANPASSEN, MAIL SENDEN + 'If DT_PLATTS.Rows.Count > 0 Then + ' 'Dim XLS_PAth = IDS_FILE.Replace(".xls", "_NEW.xls") + ' Dim FIN_FILE = FILE_NEW.Replace("_ORIG.xls", ".xlsx") + + + ' Dim XLS_Tmp = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genExcelFromDT_NEW(DT_PLATTS,,,,, False) + ' If XLS_Tmp <> "" Then + ' IO.File.Move(XLS_Tmp, FIN_FILE) ' Verschiebt die Datei + + ' ' Dim FIN_FILE = IDS_FILE.Replace("_ORIG.xls", ".xls") + ' Dim MAIL_attach As New List(Of String) + ' MAIL_attach.Add(FIN_FILE) + ' VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("al@verag.ag", "IDSPRD: Platts Price Report", "*AUTO*",,,,,, MAIL_attach) + + ' End If + 'End If + Excel1.Workbooks.Close System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Excel1) System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Blatt) @@ -1003,11 +1234,115 @@ Public Class frmStartOptions Blatt = Nothing GC.Collect() - Catch ex2 As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex2.Message, ex2.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) - End Try - End Try + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + + Try + Excel1.Workbooks.Close + System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Excel1) + System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Blatt) + Excel1 = Nothing + Blatt = Nothing + GC.Collect() + + Catch ex2 As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex2.Message, ex2.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + End Try + End Try + + + '::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: + 'NEUES EXCEL ERSTELLEN::::::: + '::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: + If DT_PLATTS.Rows.Count > 0 Then + Dim Excel2 As Object 'New Microsoft.Office.Interop.Excel.Application + Dim Blatt2 As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet + Excel2 = CreateObject("Excel.Application") + Dim Datei2 As Object 'as WorkBook + ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(destFull, "00", System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + + Try + + With Excel2 + Try + + Datei2 = .Workbooks.Open(System.AppDomain.CurrentDomain.BaseDirectory & "\Resources\Muster_IDS_PLATTSPR.xls",, True) 'Anpassen + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + MsgBox(ex.Message & ex.StackTrace) + End Try + + Blatt2 = Datei2.Worksheets(1) + + Dim zeile = 12 + + 'Blatt2.Range("G:G").NumberFormat = "0.000" + For Each ROW In DT_PLATTS.Rows + Blatt2.Range("A" & zeile).Value = ROW("IsoCode") + Blatt2.Range("B" & zeile).Value = ROW("Outlet") + Blatt2.Range("C" & zeile).Value = ROW("Group Description") + Blatt2.Range("D" & zeile).Value = ROW("Product") + Blatt2.Range("E" & zeile).Value = ROW("Price Period Start").ToString + Blatt2.Range("F" & zeile).Value = ROW("Price Period End").ToString + Blatt2.Range("G" & zeile).Value = CDbl(ROW("NetpriceNEW")) '.ToString("N3") + Blatt2.Range("H" & zeile).Value = ROW("Currency") + + zeile += 1 + Next + + + End With + + Dim FIN_FILE = FILE_NEW.Replace("_ORIG.xls", ".xls") + While IO.File.Exists(FIN_FILE) + FIN_FILE = FILE_NEW.Replace("_ORIG.xls", Now.ToString("_ddMMyy.HHmmss") & ".xls") + End While + + + Datei2.SaveAs(FIN_FILE) + + + Excel2.Workbooks.Close + System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Excel2) + System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Blatt2) + Excel2 = Nothing + Blatt2 = Nothing + GC.Collect() + + + + '::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: + 'NEUES EXCEL PER MAIL SCHICKEN::::::: + '::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: + + Dim MAIL_attach As New List(Of String) + MAIL_attach.Add(FIN_FILE) + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail("z.batinic@verag.ag;n.ljubas@verag.ag;s.vidovic@verag.ag;ma@verag.ag;alex@verag.ag;ft@verag.ag", "IDSPRD: Platts Price Report", "*AUTO*",,,, "sales@verag.ag;al@verag.ag",, MAIL_attach) + + '::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: + + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + + Try + Excel2.Workbooks.Close + System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Excel2) + System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Blatt2) + Excel2 = Nothing + Blatt2 = Nothing + GC.Collect() + + Catch ex2 As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex2.Message, ex2.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + End Try + End Try + + End If + + + Next End If Catch ex As Exception @@ -1027,110 +1362,163 @@ Public Class frmStartOptions End If End Function - Function doExcelImportNCTS_FREMD(destFull As String) As Boolean - 'Excel2.Workbooks.Open(destFull,, True) - Dim Excel1 As Object 'New Microsoft.Office.Interop.Excel.Application - Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet - Excel1 = CreateObject("Excel.Application") - Dim txt As String - Dim Datei As Object 'as WorkBook - ' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(destFull, "00", System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) - - Try - With Excel1 - - Datei = .Workbooks.Open(destFull,, True) 'Anpassen - 'Try - ' Datei = .Workbooks.Open(destFull,, True) 'Anpassen - 'Catch ex As Exception - ' System.Threading.Thread.Sleep(5000) ' 5 Sek. warten --> noch Zugriff vom Erstellen? - ' Datei = .Workbooks.Open(destFull,, True) - 'End Try - - Blatt = Datei.Worksheets(1) 'Anpassen - - 'Excel1.Workbooks.Open(destFull) - 'Excel1.Visible = True ....wers braucht ? - - Dim zeile = 2 - 'txt ="" - While zeile <= 10000 AndAlso Blatt.Range("A" & zeile) IsNot Nothing AndAlso Blatt.Range("F" & zeile) IsNot Nothing AndAlso Blatt.Range("A" & zeile).Value = "GB" - ' If zeile < 5 Then VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("MIC", "AA", System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) - 'asd - Dim MRN = Blatt.Range("F" & zeile).Value - If MRN <> "" Then - 'If zeile < 5 Then VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("MIC", "OO", System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) - - Dim NCTS_FREMD = VERAG_PROG_ALLGEMEIN.cNCTS_TR.LOADByMRN(MRN, True) - If NCTS_FREMD Is Nothing Then NCTS_FREMD = New VERAG_PROG_ALLGEMEIN.cNCTS_TR() - - Dim StatusTxt = Blatt.Range("G" & zeile).Value - - NCTS_FREMD.ncts_ObjectName = Blatt.Range("H" & zeile).Value - NCTS_FREMD.ncts_MRN = MRN - NCTS_FREMD.ncts_Partnersystem = "MIC" - NCTS_FREMD.ncts_ArtAnmeldung = Blatt.Range("D" & zeile).Value - - NCTS_FREMD.ncts_Trans_DatumZeit = Blatt.Range("E" & zeile).Value - NCTS_FREMD.ncts_Erstellung = Blatt.Range("E" & zeile).Value - NCTS_FREMD.ncts_Eroeffnung = Blatt.Range("E" & zeile).Value - NCTS_FREMD.ncts_Ankunft = Blatt.Range("U" & zeile).Value - NCTS_FREMD.ncts_Erledigung = Blatt.Range("U" & zeile).Value 'WriteOff ->nicht sicher - - NCTS_FREMD.ncts_AbgangsDienststellennummer = Blatt.Range("M" & zeile).Value - NCTS_FREMD.ncts_BestimmungsstelleDienststellennummer = Blatt.Range("N" & zeile).Value - NCTS_FREMD.ncts_VersendungsLandCode = Blatt.Range("K" & zeile).Value - NCTS_FREMD.ncts_BestimmungslandCode = Blatt.Range("L" & zeile).Value - NCTS_FREMD.ncts_Wiedergestellungsdatum = Blatt.Range("T" & zeile).Value 'Frist + Function doExcelImportNCTS_FREMD() As Boolean + Dim sql As New VERAG_PROG_ALLGEMEIN.SQL + Dim DS As VERAG_PROG_ALLGEMEIN.cDATENSERVER = Nothing + Dim ZIEL_PFAD = VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.getRootDir() & "DAKOSY\ECHTSYSTEM\ZOLLDATEN\NCTS_XLS\NEW\" - If StatusTxt.ToString.Contains("Write-off notification") Then - NCTS_FREMD.ncts_Status = 60 - ElseIf StatusTxt.ToString.Contains("Release for transit") Then - NCTS_FREMD.ncts_Status = 50 - Else - NCTS_FREMD.ncts_Status = 5 + If IO.Directory.Exists(ZIEL_PFAD) Then + + For Each MIC_FILE In IO.Directory.GetFiles(ZIEL_PFAD) + + '::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: + ' EXCEL AUSLESEN::::::: + '::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: + + + 'Excel2.Workbooks.Open(destFull,, True) + Dim Excel1 As Object 'New Microsoft.Office.Interop.Excel.Application + Dim Blatt As Object 'Microsoft.Office.Interop.Excel.Worksheet 'As Object 'as Worksheet + Excel1 = CreateObject("Excel.Application") + Dim txt As String + Dim Datei As Object 'as WorkBook + + Try + With Excel1 + + Datei = .Workbooks.Open(MIC_FILE,, True) 'Anpassen + 'Try + ' Datei = .Workbooks.Open(destFull,, True) 'Anpassen + 'Catch ex As Exception + ' System.Threading.Thread.Sleep(5000) ' 5 Sek. warten --> noch Zugriff vom Erstellen? + ' Datei = .Workbooks.Open(destFull,, True) + 'End Try + + Blatt = Datei.Worksheets(1) 'Anpassen + + 'Excel1.Workbooks.Open(destFull) + 'Excel1.Visible = True ....wers braucht ? + + Dim zeile = 2 + 'txt ="" + While zeile <= 20000 AndAlso Blatt.Range("A" & zeile) IsNot Nothing AndAlso Blatt.Range("A" & zeile).value IsNot Nothing AndAlso Blatt.Range("A" & zeile).value <> "" AndAlso Blatt.Range("F" & zeile) IsNot Nothing AndAlso Blatt.Range("A" & zeile).Value = "GB" + ' If zeile < 5 Then VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("MIC", "AA", System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + 'asd + Dim MRN = Blatt.Range("F" & zeile).Value + If MRN <> "" Then + 'If zeile < 5 Then VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR("MIC", "OO", System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + + Dim NCTS_FREMD = VERAG_PROG_ALLGEMEIN.cNCTS_TR.LOADByMRN(MRN, True) + If NCTS_FREMD Is Nothing Then NCTS_FREMD = New VERAG_PROG_ALLGEMEIN.cNCTS_TR() + + Dim StatusTxt = Blatt.Range("G" & zeile).Value + + NCTS_FREMD.ncts_ObjectName = Blatt.Range("H" & zeile).Value + NCTS_FREMD.ncts_MRN = MRN + NCTS_FREMD.ncts_Partnersystem = "MIC" + NCTS_FREMD.ncts_ArtAnmeldung = Blatt.Range("D" & zeile).Value + + NCTS_FREMD.ncts_Trans_DatumZeit = Blatt.Range("E" & zeile).Value + NCTS_FREMD.ncts_Erstellung = Blatt.Range("E" & zeile).Value + NCTS_FREMD.ncts_Eroeffnung = Blatt.Range("E" & zeile).Value + NCTS_FREMD.ncts_Ankunft = Blatt.Range("U" & zeile).Value + If Blatt.Range("U" & zeile).Value IsNot Nothing AndAlso IsDate(Blatt.Range("U" & zeile).Value) Then + NCTS_FREMD.ncts_Erledigung = Blatt.Range("U" & zeile).Value 'WriteOff ->nicht sicher + NCTS_FREMD.ncts_GestelltAm = Blatt.Range("U" & zeile).Value 'WriteOff ->nicht sicher + End If + If NCTS_FREMD.ncts_Erledigung IsNot Nothing AndAlso IsDate(NCTS_FREMD.ncts_Erledigung) Then + NCTS_FREMD.ncts_Gestellt = True + End If + + NCTS_FREMD.ncts_AbgangsDienststellennummer = Blatt.Range("M" & zeile).Value + NCTS_FREMD.ncts_BestimmungsstelleDienststellennummer = Blatt.Range("N" & zeile).Value + NCTS_FREMD.ncts_VersendungsLandCode = Blatt.Range("K" & zeile).Value + NCTS_FREMD.ncts_BestimmungslandCode = Blatt.Range("L" & zeile).Value + NCTS_FREMD.ncts_Wiedergestellungsdatum = Blatt.Range("T" & zeile).Value 'Frist + + Dim PLANT = Blatt.Range("B" & zeile).Value 'Plant + + Select Case PLANT + Case "01" : NCTS_FREMD.ncts_firma = "VERAG" : NCTS_FREMD.ncts_niederlassung = "SUB" + Case "02" : NCTS_FREMD.ncts_firma = "UNISPED" : NCTS_FREMD.ncts_niederlassung = "SUB" + Case "03" : NCTS_FREMD.ncts_firma = "AWOR" : NCTS_FREMD.ncts_niederlassung = "LNZ" + End Select + + Select Case If(StatusTxt, "") + Case "Write-off notification" + NCTS_FREMD.ncts_Status = 60 + Case "Declaration sent", "Declaration Positive Acknowledge" + NCTS_FREMD.ncts_Status = 41 + Case "Release for transit", "Cancellation request sent" + NCTS_FREMD.ncts_Status = 50 + Case "Cancellation request accepted" + NCTS_FREMD.ncts_Status = 90 + Case Else + NCTS_FREMD.ncts_Status = 5 + End Select + NCTS_FREMD.ncts_Status_KEWILL_Equivalent = NCTS_FREMD.ncts_Status + + + + NCTS_FREMD.ncts_SICHERHEITSANGABEN.Clear() + Dim GRN As New VERAG_PROG_ALLGEMEIN.cNCTS_TR_Sicherheitsangaben + GRN.nctsSA_GRN = Blatt.Range("P" & zeile).Value + GRN.nctsSA_AbgabenBetrag = Blatt.Range("R" & zeile).Value 'GBP????? + NCTS_FREMD.ncts_SICHERHEITSANGABEN.Add(GRN) + NCTS_FREMD.SAVE_ALL() + + End If + zeile += 1 + + End While + If VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW Then + MsgBox(zeile & " Zeilen eingearbeitet.") End If - NCTS_FREMD.ncts_Status_KEWILL_Equivalent = NCTS_FREMD.ncts_Status + End With - NCTS_FREMD.ncts_SICHERHEITSANGABEN.Clear() - Dim GRN As New VERAG_PROG_ALLGEMEIN.cNCTS_TR_Sicherheitsangaben - GRN.nctsSA_GRN = Blatt.Range("P" & zeile).Value - GRN.nctsSA_AbgabenBetrag = Blatt.Range("R" & zeile).Value 'GBP????? - NCTS_FREMD.ncts_SICHERHEITSANGABEN.Add(GRN) - NCTS_FREMD.SAVE_ALL() + Excel1.Workbooks.Close + System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Excel1) + System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Blatt) + Excel1 = Nothing + Blatt = Nothing + GC.Collect() - End If - zeile += 1 + 'Return True - End While + Catch ex As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) - End With + Try + Excel1.Workbooks.Close + System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Excel1) + System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Blatt) + Excel1 = Nothing + Blatt = Nothing + GC.Collect() - Excel1.Workbooks.Close - System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Excel1) - System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Blatt) - Excel1 = Nothing - Blatt = Nothing - GC.Collect() + Catch ex2 As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex2.Message, ex2.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + End Try + End Try + Try + + Dim newFile = MIC_FILE.Replace("\NEW\", "\" & Now.Year & "\") + + While IO.File.Exists(newFile) + newFile = MIC_FILE.Replace("\NEW\", "\" & Now.Year & "\" & Now.ToString("ddMMyy_HHmmss") & "_") + End While + + IO.File.Move(MIC_FILE, newFile) + + Catch ex2 As Exception + VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex2.Message, ex2.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) + End Try + + Next Return True - - Catch ex As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) - - Try - Excel1.Workbooks.Close - System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Excel1) - System.Runtime.InteropServices.Marshal.FinalReleaseComObject(Blatt) - Excel1 = Nothing - Blatt = Nothing - GC.Collect() - - Catch ex2 As Exception - VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex2.Message, ex2.StackTrace, System.Reflection.MethodBase.GetCurrentMethod.Name, VERAG_PROG_ALLGEMEIN.ERROR_OP.MAIL) - End Try - End Try + End If Return False End Function Function insertIntoSpedBuch_MIC(FilialenNr As Integer, AbfertigungsNr As Integer, AtlasBezNrNCTS As String, AtlasBezNrEZA As String, ByRef SPEDBUCH As VERAG_PROG_ALLGEMEIN.cSpeditionsbuch, MRN As String) As Boolean @@ -1734,6 +2122,62 @@ Public Class frmStartOptions End Function + Function sendWOELFL_USTVAntraege(Mail_To, Optional Mail_CC = "", Optional Mail_BCC = "") + Try + Dim SQL As New VERAG_PROG_ALLGEMEIN.SQL + + Dim dt = SQL.loadDgvBySql(" + SELECT [UStVAn_KuNr]VERAGKundenNr + ,isnull(WölflKundenNr,'')PartnerKundenNr + --,[UStVAn_LandNr] + ,cast([UStVAn_ReDatVon]as date)ReDatVon + ,cast([UStVAn_ReDatBis]as date)ReDatBis + ,LND.LandKz AntragsLand + ,[UStVAn_Name]Firma + ,isnull([UStVAn_Straße],'')Strasse + ,isnull([UStVAn_LandKz],'')LandKz + ,isnull([UStVAn_PLZ],'')Plz + ,isnull([UStVAn_Ort],'') Ort + , isnull(cast( cast([UStVAn_AntragEingereichtAm] as date)as varchar),'') AntragEingereichtAm + ,isnull([UStVAn_VZBetrag],'')VZBetrag + , isnull(cast( cast([UStVAn_VZDatum] as date)as varchar),'') VZDatum + ,isnull([UStVAn_RZBetragVZ],'')RZBetragVZ + , isnull(cast( cast([UStVAn_RZDatumVZ] as date)as varchar),'') RZDatumVZ + ,isnull([UStVAn_Währungscode],'')Waehrungscode + ,isnull([UStVAn_USteuerbetrag],'')USteuerbetrag + ,isnull([UStVAn_Erstattungsbetrag],'')Erstattungsbetrag + ,isnull([UStVAn_USteuerbetragEUR],'')USteuerbetragEUR + ,isnull([UStVAn_ErstattungsbetragEUR],'') ErstattungsbetragEUR + FROM [VERAG].[dbo].[tblUStVAntrag] + inner join [Länderverzeichnis für die Außenhandelsstatistik] as LND on LandNr=UStVAn_LandNr + inner join Adressen on UStVAn_KuNr=AdressenNr + where UStVAn_ReDatVon>= cast(('01.01.' + cast((DATEPART(YEAR,getdate())-1) as varchar)) as date) + and (UStVAn_KuNr between 150000 and 159999 OR UStVAn_KuNr between 180000 and 189999 ) + order by UStVAn_KuNr,[UStVAn_LandNr],UStVAn_ReDatVon + ", "FMZOLL") + + If dt IsNot Nothing AndAlso dt.Rows.Count > 0 Then + Dim PDF = VERAG_PROG_ALLGEMEIN.cProgramFunctions.genCSVFromDT(dt, False) + If PDF <> "" Then + Dim list As New List(Of String) + list.Add(PDF) + Dim Body = "Anbei befindet sich die Auflistung der USTV-Anträge.
" + + Body &= "

Erstellt am: " & Now.ToShortDateString & ", um " & Now.ToShortTimeString + Body &= "

Automatisch generiertes E-Mail." + Dim Mail_betreff = "USTV-Anträge" + + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(Mail_To, Mail_betreff, Body,,, False, Mail_CC, Mail_BCC, list) + + End If + End If + Return True + Catch ex As Exception + MsgBox(ex.Message & ex.StackTrace) + Return False + End Try + End Function + Function getUID_Pruefung(maxAnz As Integer, Mail_FIMRA As String, Mail_betreff As String, Mail_To As String, Optional Mail_CC As String = "", Optional Mail_BCC As String = "", Optional TageZurueck As String = "") As Boolean Dim firmatmp = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA Try @@ -2668,4 +3112,23 @@ Public Class frmStartOptions Dim bool = getUID_Pruefung(MyTextBox1.Text, "UNISPED", "UID Prüfung UNISPED", "al@verag.ag", "al@verag.ag",, MyTextBox2._value) showPic(bool, PictureBox12) End Sub + + Private Sub Button14_Click(sender As Object, e As EventArgs) Handles Button14.Click + VERAG_PROG_ALLGEMEIN.cLDV_Interface.copyLDV_BMD() + + End Sub + + Private Sub TabPage1_Click(sender As Object, e As EventArgs) Handles TabPage1.Click + + End Sub + + Private Sub Button15_Click(sender As Object, e As EventArgs) Handles Button15.Click + doExcelImportNCTS_FREMD() + End Sub + + Private Sub Button16_Click(sender As Object, e As EventArgs) Handles Button16.Click + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + doIDSPlatts() + doExcelImportNCTS_FREMD() + End Sub End Class \ No newline at end of file