diff --git a/UID/Classes/cDienstSettings.vb b/UID/Classes/cDienstSettings.vb index ac983e3..e24afb7 100644 --- a/UID/Classes/cDienstSettings.vb +++ b/UID/Classes/cDienstSettings.vb @@ -16,6 +16,7 @@ Public Class cDienstSettings Property dpset_AbfAuswertung As Boolean Property dpset_StudenAuswertung As Boolean Property dpset_AvisoAuswertung As Boolean + Property dpset_land As String @@ -26,6 +27,7 @@ Public Class cDienstSettings LOAD() End Sub + Function getParameterList() As List(Of SQLVariable) Dim list As New List(Of SQLVariable) list.Add(New SQLVariable("dpset_id", dpset_id, , True)) @@ -42,6 +44,7 @@ Public Class cDienstSettings list.Add(New SQLVariable("dpset_AbfAuswertung", dpset_AbfAuswertung)) list.Add(New SQLVariable("dpset_StudenAuswertung", dpset_StudenAuswertung)) list.Add(New SQLVariable("dpset_AvisoAuswertung", dpset_AvisoAuswertung)) + list.Add(New SQLVariable("dpset_land", dpset_land)) Return list End Function @@ -88,6 +91,26 @@ Public Class cDienstSettings + Shared Function getLand(dpset_niederlassung) As String + getLand = "AT" 'Defaut + Try + Using conn As SqlConnection = cSqlDb.GetNewOpenConnection() + Using cmd As New SqlCommand("SELECT dpset_land FROM tblDienstSettings WHERE dpset_niederlassung=@dpset_niederlassung ", conn) + cmd.Parameters.AddWithValue("@dpset_niederlassung", dpset_niederlassung) + Dim dr = cmd.ExecuteReader() + If dr.Read Then + getLand = dr.Item(0) + End If + dr.Close() + End Using + End Using + Catch ex As Exception + MsgBox("Fehler in der Funktion '" & System.Reflection.MethodInfo.GetCurrentMethod.Name & "'" & vbNewLine & vbNewLine & ex.Message & vbNewLine & vbNewLine & ex.StackTrace) + End Try + End Function + + + Public Function getUpdateCmd() As String Try Dim list As List(Of SQLVariable) = getParameterList() diff --git a/UID/Dienstplan/cFeiertage.vb b/UID/Dienstplan/cFeiertage.vb index b16d903..bbac6a4 100644 --- a/UID/Dienstplan/cFeiertage.vb +++ b/UID/Dienstplan/cFeiertage.vb @@ -57,6 +57,24 @@ End Get End Property + ''' + ''' Gibt das Datum für den BussUndBettag zurück. + ''' + Public ReadOnly Property BussUndBettag() As Date + Get + Dim i As Long + Dim VierterAdvent As Date + For i = 24 To 1 Step -1 + If CDate(i & ".12." & _Year).ToString("ddd") = "So" Then + VierterAdvent = CDate(i & ".12." & _Year).ToShortDateString + Exit For + End If + Next i + Dim ErsterAdvent As Date = DateAdd("d", -21, VierterAdvent) + Return DateAdd("d", -11, ErsterAdvent) 'BussUndBettag + End Get + + End Property ''' ''' Gibt das Datum für den Karfreitag zurück. ''' @@ -112,14 +130,11 @@ End Property - Public Function isFeiertag(datum As Date) As Boolean + Public Function isFeiertag(datum As Date, land As String) As Boolean If datum = CDate("01.01." & _Year) Then Return True If datum = CDate("06.01." & _Year) Then Return True - If datum = CDate("01.05." & _Year) Then Return True If datum = CDate("15.08." & _Year) Then Return True - If datum = CDate("26.10." & _Year) Then Return True If datum = CDate("01.11." & _Year) Then Return True - If datum = CDate("08.12." & _Year) Then Return True If datum = CDate("25.12." & _Year) Then Return True If datum = CDate("26.12." & _Year) Then Return True If datum = Ostermontag Then Return True @@ -128,7 +143,20 @@ If datum = Pfingstmontag Then Return True If datum = Pfingstsonntag Then Return True If datum = Fronleichnam Then Return True - Return False + + Select Case land + Case "AT" + If datum = CDate("26.10." & _Year) Then Return True + If datum = CDate("08.12." & _Year) Then Return True + If datum = CDate("01.05." & _Year) Then Return True 'Staatsfeiertag + Case "DE" 'BAYERN + If datum = CDate("03.10." & _Year) Then Return True ' Tag der Deutschen Einheit + If datum = BussUndBettag Then Return True ' Buß- und Bettag '!!!!ABEWEICHEND + If datum = CDate("08.08." & _Year) Then Return True ' Augsburger Friedensfest + If datum = CDate("01.05." & _Year) Then Return True ' Maifeiertag + If datum = Karfreitag Then Return True + End Select + Return False End Function End Class \ No newline at end of file diff --git a/UID/Dienstplan/frmDienstplan.vb b/UID/Dienstplan/frmDienstplan.vb index 2863316..78ef7db 100644 --- a/UID/Dienstplan/frmDienstplan.vb +++ b/UID/Dienstplan/frmDienstplan.vb @@ -14,6 +14,7 @@ Public Class frmDienstplan Private scr_top As Integer = 50 Dim week() As String = {"SO", "MO", "DI", "MI", "DO", "FR", "SA"} Private SCHICHT = "ROT" + Dim SETTINGS As cDienstSettings Dim SQLDienst As New cDienstplan Dim ListMA As New List(Of cMAShort) @@ -270,6 +271,8 @@ Public Class frmDienstplan Me.berechtigung = VERAG_PROG_ALLGEMEIN.cBerechtignunen.CHECK_BERECHTIGUNG(Me.Name, 1) If Me.berechtigung = 99 Then Me.Close() : Exit Sub + SETTINGS = New cDienstSettings(niederlassung) + Me.Cursor = Cursors.WaitCursor aktWoche = DateToWeek(aktDate).Substring(4, 2) aktJahr = DateToWeek(aktDate).Substring(0, 4) @@ -865,7 +868,7 @@ Public Class frmDienstplan eintrag.dstetr_dstmaId = m.dstma_id eintrag.dstetr_datum = datum - If Not FT.isFeiertag(datum) Then + If Not FT.isFeiertag(datum, SETTINGS.dpset_land) Then If m.dstma_muster Then ' MsgBox("HIER") Dim tz As List(Of cDienstTeilzeit) = SQLDienst.getAllDienstTeilzeit(m.dstma_id) diff --git a/UID/Dienstplan/frmDienstplanATILLA.vb b/UID/Dienstplan/frmDienstplanATILLA.vb index e360144..55a6d29 100644 --- a/UID/Dienstplan/frmDienstplanATILLA.vb +++ b/UID/Dienstplan/frmDienstplanATILLA.vb @@ -857,7 +857,7 @@ Public Class frmDienstplanATILLA eintrag.dstetr_dstmaId = m.dstma_id eintrag.dstetr_datum = datum - If Not FT.isFeiertag(datum) Then + If Not FT.isFeiertag(datum, cDienstSettings.getLand(niederlassung)) Then If m.dstma_muster Then ' MsgBox("HIER") Dim tz As List(Of cDienstTeilzeit) = SQLDienst.getAllDienstTeilzeit(m.dstma_id) diff --git a/UID/Dienstplan/frmDienstplanVariabel.vb b/UID/Dienstplan/frmDienstplanVariabel.vb index 8e4f94b..f0e2fcc 100644 --- a/UID/Dienstplan/frmDienstplanVariabel.vb +++ b/UID/Dienstplan/frmDienstplanVariabel.vb @@ -1232,7 +1232,7 @@ Public Class frmDienstplanVariabel eintrag.dstetr_dstmaId = m.dstma_id eintrag.dstetr_datum = datum - If Not FT.isFeiertag(datum) Then + If Not FT.isFeiertag(datum, SETTINGS.dpset_land) Then If m.dstma_muster Then ' MsgBox("HIER") @@ -2467,7 +2467,7 @@ Public Class frmDienstplanVariabel Blatt = Datei.Worksheets("DIENSTPLAN") - Dim dt_Ma As DataTable = SQLDienst.loadDGV("SELECT TOP 25 [dstma_id],[dstma_mitId],[dstma_kuerzel],[dstma_arbvh] FROM [ADMIN].[dbo].[tblDienstMitarb] inner join tblMitarbeiter ON mit_id=dstma_mitId where dstma_niederlassung='" & niederlassung & "' and mit_gekuendigt=0 order by dstma_reihenfolge, dstma_kuerzel") + Dim dt_Ma As DataTable = SQLDienst.loadDGV("SELECT TOP 25 [dstma_id],[dstma_mitId],[dstma_kuerzel],[dstma_arbvh] FROM [ADMIN].[dbo].[tblDienstMitarb] inner join tblMitarbeiter ON mit_id=dstma_mitId where dstma_niederlassung='" & niederlassung & "' and mit_gekuendigt=0 and dstma_inaktiv=0 order by dstma_reihenfolge, dstma_kuerzel") Dim cnt = 0 If dt_Ma IsNot Nothing Then @@ -2487,7 +2487,7 @@ Public Class frmDienstplanVariabel Blatt.Range("A" & CInt(14 + cnt3).ToString).Font.Color = Color.Red End If - If FT.isFeiertag(dateWork) Then + If FT.isFeiertag(dateWork, SETTINGS.dpset_land) Then Blatt.Range("B" & CInt(14 + cnt3).ToString & ":" & "Z" & CInt(14 + cnt3).ToString).Interior.Color = Color.Orange Blatt.Range("A" & CInt(14 + cnt3).ToString).Font.Color = Color.Red End If diff --git a/UID/Dienstplan/usrCntlDienstplan.vb b/UID/Dienstplan/usrCntlDienstplan.vb index 492a145..466c9c0 100644 --- a/UID/Dienstplan/usrCntlDienstplan.vb +++ b/UID/Dienstplan/usrCntlDienstplan.vb @@ -382,7 +382,7 @@ Public Class usrCntlDienstplan End Select rpt.txtTag.ForeColor = Color.Black - If FT.isFeiertag(datumKW) Or datumKW.ToString("dd.MM.") = "31.12." Or datumKW.ToString("dd.MM.") = "24.12." Or datumKW.DayOfWeek = 0 Then 'Feiertag oder 1/2 Tag + If FT.isFeiertag(datumKW, cDienstSettings.getLand(niederlassung)) Or datumKW.ToString("dd.MM.") = "31.12." Or datumKW.ToString("dd.MM.") = "24.12." Or datumKW.DayOfWeek = 0 Then 'Feiertag oder 1/2 Tag rpt.txtTag.ForeColor = Color.Red rpt.Detail.BackColor = Color.FromArgb(220, 220, 220) End If diff --git a/UID/My Project/Resources.Designer.vb b/UID/My Project/Resources.Designer.vb index 4efb6d1..875d658 100644 --- a/UID/My Project/Resources.Designer.vb +++ b/UID/My Project/Resources.Designer.vb @@ -375,15 +375,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Zeichenfolge, die ähnelt. - ''' - Friend ReadOnly Property hjhjkghjklghjkhz678678568() As String - Get - Return ResourceManager.GetString("hjhjkghjklghjkhz678678568", resourceCulture) - End Get - End Property - ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -664,7 +655,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 1.9.9 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 2.0.0 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/UID/My Project/Resources.resx b/UID/My Project/Resources.resx index 7766c67..077248e 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=sa;Password=BmWr501956; - 1.9.9 + 2.0.0 ..\Resources\del.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -298,9 +298,6 @@ ..\Resources\gear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\personGray_m.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/UID/cProgramFunctions.vb b/UID/cProgramFunctions.vb index 1c8801c..e278d8a 100644 --- a/UID/cProgramFunctions.vb +++ b/UID/cProgramFunctions.vb @@ -910,7 +910,7 @@ Public Class cProgramFunctions For i = 0 To 6 ' Wochenstunden -= getWochenstundenTAG(datum, SCHICHT, dstma_id, dstma_muster, dstma_WEStdRegelAZ, dstma_arbvh, niederlassung) Dim FT As New cFeiertage(datum.Year) - If FT.isFeiertag(datum) Or datum.ToString("dd.MM.") = "31.12." Or datum.ToString("dd.MM.") = "24.12." Then 'Feiertag oder 1/2 Tag + If FT.isFeiertag(datum, cDienstSettings.getLand(niederlassung)) Or datum.ToString("dd.MM.") = "31.12." Or datum.ToString("dd.MM.") = "24.12." Then 'Feiertag oder 1/2 Tag Dim woTag = datum.ToString("ddd", New CultureInfo("de-DE")).ToUpper If dstma_muster Then 'Wenn Muster, dann muss Feiertag bei VZ und TZ berüchsichtigt werden.... @@ -962,7 +962,7 @@ Public Class cProgramFunctions Dim FT As New cFeiertage(datum.Year) Dim woTag = datum.ToString("ddd", New CultureInfo("de-DE")).ToUpper - If FT.isFeiertag(datum) Then 'Feiertag oder 1/2 Tag + If FT.isFeiertag(datum, cDienstSettings.getLand(niederlassung)) Then 'Feiertag oder 1/2 Tag getWochenstundenTAG = 0 ElseIf woTag = "SA" And woTag = "SO" Then getWochenstundenTAG = 0 diff --git a/UID/cSqlDb.vb b/UID/cSqlDb.vb index 52c2954..f154aae 100644 --- a/UID/cSqlDb.vb +++ b/UID/cSqlDb.vb @@ -3949,7 +3949,7 @@ Public Class cDienstplan 'End If If cPF.isValidTime(von) And cPF.isValidTime(bis) Then ' Wenn Format stimmt - s += cPF.getDiff(von, bis, niederlassung, (FT.isFeiertag(datum) Or woTag = "SO")) + 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")) End If diff --git a/VERAGMonitoring/My Project/Resources.Designer.vb b/VERAGMonitoring/My Project/Resources.Designer.vb index 6048927..361fe64 100644 --- a/VERAGMonitoring/My Project/Resources.Designer.vb +++ b/VERAGMonitoring/My Project/Resources.Designer.vb @@ -71,7 +71,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 1.3.1 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 1.3.3 ähnelt. ''' Friend ReadOnly Property version() As String Get diff --git a/VERAGMonitoring/My Project/Resources.resx b/VERAGMonitoring/My Project/Resources.resx index 2ef9b89..ffc686b 100644 --- a/VERAGMonitoring/My Project/Resources.resx +++ b/VERAGMonitoring/My Project/Resources.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 1.3.1 + 1.3.3 diff --git a/VERAGMonitoring/cClasses.vb b/VERAGMonitoring/cClasses.vb index ea7f232..cbe0bf9 100644 --- a/VERAGMonitoring/cClasses.vb +++ b/VERAGMonitoring/cClasses.vb @@ -55,6 +55,12 @@ Public Class cMonitoringBrg Property brgusrset_gvvAt_imex_tag_warn2 As Double = 0.0 Property brgusrset_gvvAt_imex_woche_warn1 As Double = 0.0 Property brgusrset_gvvAt_imex_woche_warn2 As Double = 0.0 + + Property brgusrset_gvvAt_ATILLA_de_summe As Double = 0.0 + Property brgusrset_gvvAt_ATILLA_tag_warn1 As Double = 0.0 + 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 End Class diff --git a/VERAGMonitoring/cSqlDb.vb b/VERAGMonitoring/cSqlDb.vb index e639601..ce3f584 100644 --- a/VERAGMonitoring/cSqlDb.vb +++ b/VERAGMonitoring/cSqlDb.vb @@ -854,6 +854,14 @@ Public Class cBrgDb cMonitoringBrg.brgusrset_gvvAt_imex_woche_warn1 = dr.Item("brgusrset_gvvAt_imex_woche_warn1") cMonitoringBrg.brgusrset_gvvAt_imex_woche_warn2 = dr.Item("brgusrset_gvvAt_imex_woche_warn2") + + + cMonitoringBrg.brgusrset_gvvAt_ATILLA_de_summe = dr.Item("brgusrset_gvvAt_ATILLA_de_summe") + cMonitoringBrg.brgusrset_gvvAt_ATILLA_tag_warn1 = dr.Item("brgusrset_gvvAt_ATILLA_tag_warn1") + cMonitoringBrg.brgusrset_gvvAt_ATILLA_tag_warn2 = dr.Item("brgusrset_gvvAt_ATILLA_tag_warn2") + cMonitoringBrg.brgusrset_gvvAt_ATILLA_woche_warn1 = dr.Item("brgusrset_gvvAt_ATILLA_woche_warn1") + cMonitoringBrg.brgusrset_gvvAt_ATILLA_woche_warn2 = dr.Item("brgusrset_gvvAt_ATILLA_woche_warn2") + End If Return cMonitoringBrg Catch ex As Exception @@ -878,7 +886,8 @@ Public Class cBrgDb " SET brgusrset_username=@brgusrset_username, brgusrset_gvvAt_summe=@brgusrset_gvvAt_summe, brgusrset_gvvAt_tag_warn1=@brgusrset_gvvAt_tag_warn1, brgusrset_gvvAt_tag_warn2=@brgusrset_gvvAt_tag_warn2, brgusrset_gvvAt_woche_warn1=@brgusrset_gvvAt_woche_warn1, brgusrset_gvvAt_woche_warn2=@brgusrset_gvvAt_woche_warn2, brgusrset_gvvDe_summe=@brgusrset_gvvDe_summe, brgusrset_gvvDe_tag_warn1=@brgusrset_gvvDe_tag_warn1, brgusrset_gvvDe_tag_warn2=@brgusrset_gvvDe_tag_warn2, brgusrset_gvvDe_woche_warn1=@brgusrset_gvvDe_woche_warn1, brgusrset_gvvDe_woche_warn2=@brgusrset_gvvDe_woche_warn2, " & " brgusrset_gvvde2_summe=@brgusrset_gvvde2_summe, brgusrset_gvvde2_tag_warn1=@brgusrset_gvvde2_tag_warn1, brgusrset_gvvde2_tag_warn2=@brgusrset_gvvde2_tag_warn2, brgusrset_gvvde2_woche_warn1=@brgusrset_gvvde2_woche_warn1, brgusrset_gvvde2_woche_warn2=@brgusrset_gvvde2_woche_warn2, " & " brgusrset_aufschub_AG_de_summe=@brgusrset_aufschub_AG_de_summe, brgusrset_aufschub_AG_de_warn1=@brgusrset_aufschub_AG_de_warn1, brgusrset_aufschub_AG_de_warn2=@brgusrset_aufschub_AG_de_warn2, brgusrset_aufschub_AG_at_summe=@brgusrset_aufschub_AG_at_summe, brgusrset_aufschub_AG_at_warn1=@brgusrset_aufschub_AG_at_warn1, brgusrset_aufschub_AG_at_warn2=@brgusrset_aufschub_AG_at_warn2, brgusrset_aufschub_CS_at_summe=@brgusrset_aufschub_CS_at_summe, brgusrset_aufschub_CS_at_warn1=@brgusrset_aufschub_CS_at_warn1, brgusrset_aufschub_CS_at_warn2=@brgusrset_aufschub_CS_at_warn2, brgusrset_aufschub_ZS_at_summe=@brgusrset_aufschub_ZS_at_summe, brgusrset_aufschub_ZS_at_warn1=@brgusrset_aufschub_ZS_at_warn1, brgusrset_aufschub_ZS_at_warn2=@brgusrset_aufschub_ZS_at_warn2, " & - " brgusrset_aufschub_imex_de_summe=@brgusrset_aufschub_imex_de_summe,brgusrset_aufschub_imex_de_warn1=@brgusrset_aufschub_imex_de_warn1,brgusrset_aufschub_imex_de_warn2=@brgusrset_aufschub_imex_de_warn2,brgusrset_gvvAt_imex_de_summe =@brgusrset_gvvAt_imex_de_summe,brgusrset_gvvAt_imex_tag_warn1=@brgusrset_gvvAt_imex_tag_warn1,brgusrset_gvvAt_imex_tag_warn2=@brgusrset_gvvAt_imex_tag_warn2,brgusrset_gvvAt_imex_woche_warn1=@brgusrset_gvvAt_imex_woche_warn1,brgusrset_gvvAt_imex_woche_warn2=@brgusrset_gvvAt_imex_woche_warn2 " & + " brgusrset_aufschub_imex_de_summe=@brgusrset_aufschub_imex_de_summe,brgusrset_aufschub_imex_de_warn1=@brgusrset_aufschub_imex_de_warn1,brgusrset_aufschub_imex_de_warn2=@brgusrset_aufschub_imex_de_warn2,brgusrset_gvvAt_imex_de_summe =@brgusrset_gvvAt_imex_de_summe,brgusrset_gvvAt_imex_tag_warn1=@brgusrset_gvvAt_imex_tag_warn1,brgusrset_gvvAt_imex_tag_warn2=@brgusrset_gvvAt_imex_tag_warn2,brgusrset_gvvAt_imex_woche_warn1=@brgusrset_gvvAt_imex_woche_warn1,brgusrset_gvvAt_imex_woche_warn2=@brgusrset_gvvAt_imex_woche_warn2, " & + " brgusrset_gvvAt_ATILLA_de_summe =@brgusrset_gvvAt_ATILLA_de_summe,brgusrset_gvvAt_ATILLA_tag_warn1=@brgusrset_gvvAt_ATILLA_tag_warn1,brgusrset_gvvAt_ATILLA_tag_warn2=@brgusrset_gvvAt_ATILLA_tag_warn2,brgusrset_gvvAt_ATILLA_woche_warn1=@brgusrset_gvvAt_ATILLA_woche_warn1,brgusrset_gvvAt_ATILLA_woche_warn2=@brgusrset_gvvAt_ATILLA_woche_warn2 " & " WHERE brgusrset_id=@brgusrset_id " Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN() @@ -923,6 +932,13 @@ Public Class cBrgDb cmd.Parameters.AddWithValue("@brgusrset_gvvAt_imex_woche_warn1", d.brgusrset_gvvAt_imex_woche_warn1) cmd.Parameters.AddWithValue("@brgusrset_gvvAt_imex_woche_warn2", d.brgusrset_gvvAt_imex_woche_warn2) + + + cmd.Parameters.AddWithValue("@brgusrset_gvvAt_ATILLA_de_summe", d.brgusrset_gvvAt_ATILLA_de_summe) + cmd.Parameters.AddWithValue("@brgusrset_gvvAt_ATILLA_tag_warn1", d.brgusrset_gvvAt_ATILLA_tag_warn1) + cmd.Parameters.AddWithValue("@brgusrset_gvvAt_ATILLA_tag_warn2", d.brgusrset_gvvAt_ATILLA_tag_warn2) + cmd.Parameters.AddWithValue("@brgusrset_gvvAt_ATILLA_woche_warn1", d.brgusrset_gvvAt_ATILLA_woche_warn1) + cmd.Parameters.AddWithValue("@brgusrset_gvvAt_ATILLA_woche_warn2", d.brgusrset_gvvAt_ATILLA_woche_warn2) Try cmd.ExecuteNonQuery() Return True diff --git a/VERAGMonitoring/frmMain.Designer.vb b/VERAGMonitoring/frmMain.Designer.vb index 8ae2de7..f9d69da 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_Atilla = New System.Windows.Forms.CheckBox() + Me.lblBrg_at_Atilla = New System.Windows.Forms.Label() + Me.lblAtWocheAtilla = New System.Windows.Forms.Label() + Me.lblAtTagAtilla = New System.Windows.Forms.Label() + Me.lblAt_woche_StatusAtilla = New System.Windows.Forms.Label() + Me.lblAt_tag_StatusAtilla = New System.Windows.Forms.Label() Me.cbxBrg_at_Imex = New System.Windows.Forms.CheckBox() Me.lblBrg_at_Imex = New System.Windows.Forms.Label() Me.lblAtWocheImex = New System.Windows.Forms.Label() @@ -113,6 +119,12 @@ Partial Class frmMain 'Panel2 ' Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Panel2.Controls.Add(Me.cbxBrg_at_Atilla) + Me.Panel2.Controls.Add(Me.lblBrg_at_Atilla) + Me.Panel2.Controls.Add(Me.lblAtWocheAtilla) + Me.Panel2.Controls.Add(Me.lblAtTagAtilla) + Me.Panel2.Controls.Add(Me.lblAt_woche_StatusAtilla) + Me.Panel2.Controls.Add(Me.lblAt_tag_StatusAtilla) Me.Panel2.Controls.Add(Me.cbxBrg_at_Imex) Me.Panel2.Controls.Add(Me.lblBrg_at_Imex) Me.Panel2.Controls.Add(Me.lblAtWocheImex) @@ -180,9 +192,80 @@ 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(646, 405) + Me.Panel2.Size = New System.Drawing.Size(646, 430) Me.Panel2.TabIndex = 8 ' + 'cbxBrg_at_Atilla + ' + Me.cbxBrg_at_Atilla.AutoSize = True + Me.cbxBrg_at_Atilla.Checked = True + Me.cbxBrg_at_Atilla.CheckState = System.Windows.Forms.CheckState.Checked + Me.cbxBrg_at_Atilla.Location = New System.Drawing.Point(9, 188) + 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 + Me.cbxBrg_at_Atilla.UseVisualStyleBackColor = True + ' + 'lblBrg_at_Atilla + ' + 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.Name = "lblBrg_at_Atilla" + Me.lblBrg_at_Atilla.Size = New System.Drawing.Size(171, 13) + Me.lblBrg_at_Atilla.TabIndex = 32 + Me.lblBrg_at_Atilla.Text = "AT - gVV - HZA Linz/Wels ATILLA" + ' + 'lblAtWocheAtilla + ' + 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(509, 188) + Me.lblAtWocheAtilla.Name = "lblAtWocheAtilla" + Me.lblAtWocheAtilla.RightToLeft = System.Windows.Forms.RightToLeft.Yes + Me.lblAtWocheAtilla.Size = New System.Drawing.Size(90, 13) + Me.lblAtWocheAtilla.TabIndex = 33 + Me.lblAtWocheAtilla.Text = " 0 €" + ' + 'lblAtTagAtilla + ' + 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(360, 189) + Me.lblAtTagAtilla.Name = "lblAtTagAtilla" + Me.lblAtTagAtilla.RightToLeft = System.Windows.Forms.RightToLeft.Yes + Me.lblAtTagAtilla.Size = New System.Drawing.Size(90, 13) + Me.lblAtTagAtilla.TabIndex = 34 + Me.lblAtTagAtilla.Text = " 0 €" + ' + 'lblAt_woche_StatusAtilla + ' + Me.lblAt_woche_StatusAtilla.AutoSize = True + Me.lblAt_woche_StatusAtilla.BackColor = System.Drawing.Color.Green + 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(605, 188) + 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) + Me.lblAt_woche_StatusAtilla.TabIndex = 35 + Me.lblAt_woche_StatusAtilla.Text = "OK" + ' + 'lblAt_tag_StatusAtilla + ' + Me.lblAt_tag_StatusAtilla.AutoSize = True + Me.lblAt_tag_StatusAtilla.BackColor = System.Drawing.Color.Green + 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(458, 189) + 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) + Me.lblAt_tag_StatusAtilla.TabIndex = 36 + Me.lblAt_tag_StatusAtilla.Text = "OK" + ' 'cbxBrg_at_Imex ' Me.cbxBrg_at_Imex.AutoSize = True @@ -258,7 +341,7 @@ Partial Class frmMain ' 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(503, 283) + Me.Label3.Location = New System.Drawing.Point(503, 303) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(128, 13) Me.Label3.TabIndex = 25 @@ -268,7 +351,7 @@ Partial Class frmMain ' 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(388, 250) + Me.lblAufschubBrg_de_Imex_oE.Location = New System.Drawing.Point(388, 270) 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) @@ -279,7 +362,7 @@ Partial Class frmMain ' 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(388, 340) + Me.lblAufschubBrg_at_VeragZS_oE.Location = New System.Drawing.Point(388, 360) 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) @@ -291,7 +374,7 @@ Partial Class frmMain ' 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(388, 320) + Me.lblAufschubBrg_at_VeragCS_oE.Location = New System.Drawing.Point(388, 340) 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) @@ -303,7 +386,7 @@ Partial Class frmMain ' 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(388, 231) + Me.lblAufschubBrg_de_VeragAG_oE.Location = New System.Drawing.Point(388, 251) 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) @@ -314,7 +397,7 @@ Partial Class frmMain ' 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(388, 300) + Me.lblAufschubBrg_at_VeragAG_oE.Location = New System.Drawing.Point(388, 320) 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) @@ -327,7 +410,7 @@ Partial Class frmMain Me.cbxAufschub_de_Imex.AutoSize = True Me.cbxAufschub_de_Imex.Checked = True Me.cbxAufschub_de_Imex.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxAufschub_de_Imex.Location = New System.Drawing.Point(9, 251) + Me.cbxAufschub_de_Imex.Location = New System.Drawing.Point(9, 271) 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 @@ -337,7 +420,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, 251) + Me.lblAufschub_de_Imex.Location = New System.Drawing.Point(26, 271) Me.lblAufschub_de_Imex.Name = "lblAufschub_de_Imex" Me.lblAufschub_de_Imex.Size = New System.Drawing.Size(254, 13) Me.lblAufschub_de_Imex.TabIndex = 15 @@ -347,7 +430,7 @@ Partial Class frmMain ' 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(509, 250) + Me.lblAufschubBrg_de_Imex.Location = New System.Drawing.Point(509, 270) 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) @@ -358,7 +441,7 @@ Partial Class frmMain ' 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(268, 257) + Me.lblAufschubAkt_de_Imex.Location = New System.Drawing.Point(268, 277) 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) @@ -373,7 +456,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(605, 250) + Me.lblAufschubStatus_de_Imex.Location = New System.Drawing.Point(605, 270) 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) @@ -464,7 +547,7 @@ Partial Class frmMain 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(6, 373) + Me.Label2.Location = New System.Drawing.Point(6, 393) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(177, 13) Me.Label2.TabIndex = 5 @@ -475,7 +558,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(183, 368) + Me.Button4.Location = New System.Drawing.Point(183, 388) Me.Button4.Name = "Button4" Me.Button4.Size = New System.Drawing.Size(62, 23) Me.Button4.TabIndex = 4 @@ -488,7 +571,7 @@ Partial Class frmMain Me.cbxAufschub_at_VeragZS.AutoSize = True Me.cbxAufschub_at_VeragZS.Checked = True Me.cbxAufschub_at_VeragZS.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxAufschub_at_VeragZS.Location = New System.Drawing.Point(9, 341) + Me.cbxAufschub_at_VeragZS.Location = New System.Drawing.Point(9, 361) 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 @@ -596,7 +679,7 @@ Partial Class frmMain Me.cbxAufschub_at_VeragCS.AutoSize = True Me.cbxAufschub_at_VeragCS.Checked = True Me.cbxAufschub_at_VeragCS.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxAufschub_at_VeragCS.Location = New System.Drawing.Point(9, 321) + Me.cbxAufschub_at_VeragCS.Location = New System.Drawing.Point(9, 341) 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 @@ -617,7 +700,7 @@ Partial Class frmMain Me.cbxAufschub_at_VeragAG.AutoSize = True Me.cbxAufschub_at_VeragAG.Checked = True Me.cbxAufschub_at_VeragAG.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxAufschub_at_VeragAG.Location = New System.Drawing.Point(9, 301) + Me.cbxAufschub_at_VeragAG.Location = New System.Drawing.Point(9, 321) 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 @@ -628,7 +711,7 @@ Partial Class frmMain Me.cbxAufschub_de_VeragAG.AutoSize = True Me.cbxAufschub_de_VeragAG.Checked = True Me.cbxAufschub_de_VeragAG.CheckState = System.Windows.Forms.CheckState.Checked - Me.cbxAufschub_de_VeragAG.Location = New System.Drawing.Point(9, 232) + Me.cbxAufschub_de_VeragAG.Location = New System.Drawing.Point(9, 252) 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 @@ -638,7 +721,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(153, 202) + Me.Label5.Location = New System.Drawing.Point(153, 222) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(76, 13) Me.Label5.TabIndex = 1 @@ -658,7 +741,7 @@ Partial Class frmMain 'Button1 ' Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Location = New System.Drawing.Point(528, 368) + Me.Button1.Location = New System.Drawing.Point(528, 388) Me.Button1.Name = "Button1" Me.Button1.Size = New System.Drawing.Size(103, 23) Me.Button1.TabIndex = 0 @@ -669,7 +752,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, 202) + Me.Label7.Location = New System.Drawing.Point(6, 222) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(139, 13) Me.Label7.TabIndex = 1 @@ -682,7 +765,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(605, 340) + Me.lblAufschubStatus_at_VeragZS.Location = New System.Drawing.Point(605, 360) 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) @@ -696,7 +779,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(605, 320) + Me.lblAufschubStatus_at_VeragCS.Location = New System.Drawing.Point(605, 340) 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) @@ -707,7 +790,7 @@ Partial Class frmMain ' 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(268, 341) + Me.lblAufschubAkt_at_VeragZS.Location = New System.Drawing.Point(268, 361) 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) @@ -729,7 +812,7 @@ Partial Class frmMain ' 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(509, 340) + Me.lblAufschubBrg_at_VeragZS.Location = New System.Drawing.Point(509, 360) 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) @@ -740,7 +823,7 @@ Partial Class frmMain ' 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(268, 321) + Me.lblAufschubAkt_at_VeragCS.Location = New System.Drawing.Point(268, 341) 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) @@ -763,7 +846,7 @@ Partial Class frmMain ' 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(509, 320) + Me.lblAufschubBrg_at_VeragCS.Location = New System.Drawing.Point(509, 340) 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) @@ -785,7 +868,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, 341) + Me.lblAufschub_at_VeragZS.Location = New System.Drawing.Point(26, 361) 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 @@ -809,7 +892,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, 321) + Me.lblAufschub_at_VeragCS.Location = New System.Drawing.Point(26, 341) 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 @@ -819,7 +902,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, 232) + Me.lblAufschub_de_VeragAG.Location = New System.Drawing.Point(26, 252) Me.lblAufschub_de_VeragAG.Name = "lblAufschub_de_VeragAG" Me.lblAufschub_de_VeragAG.Size = New System.Drawing.Size(219, 13) Me.lblAufschub_de_VeragAG.TabIndex = 1 @@ -853,7 +936,7 @@ Partial Class frmMain ' 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(361, 202) + Me.Label8.Location = New System.Drawing.Point(361, 222) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(116, 13) Me.Label8.TabIndex = 1 @@ -863,7 +946,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, 301) + Me.lblAufschub_at_VeragAG.Location = New System.Drawing.Point(26, 321) 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 @@ -873,7 +956,7 @@ Partial Class frmMain ' 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(515, 202) + Me.Label34.Location = New System.Drawing.Point(515, 222) Me.Label34.Name = "Label34" Me.Label34.Size = New System.Drawing.Size(116, 13) Me.Label34.TabIndex = 1 @@ -883,7 +966,7 @@ Partial Class frmMain ' 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(509, 231) + Me.lblAufschubBrg_de_VeragAG.Location = New System.Drawing.Point(509, 251) 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) @@ -904,7 +987,7 @@ Partial Class frmMain ' 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(268, 238) + Me.lblAufschubAkt_de_VeragAG.Location = New System.Drawing.Point(268, 258) 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) @@ -926,7 +1009,7 @@ Partial Class frmMain ' 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(509, 300) + Me.lblAufschubBrg_at_VeragAG.Location = New System.Drawing.Point(509, 320) 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) @@ -940,7 +1023,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(605, 300) + Me.lblAufschubStatus_at_VeragAG.Location = New System.Drawing.Point(605, 320) 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) @@ -951,7 +1034,7 @@ Partial Class frmMain ' 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(268, 301) + Me.lblAufschubAkt_at_VeragAG.Location = New System.Drawing.Point(268, 321) 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) @@ -966,7 +1049,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(605, 231) + Me.lblAufschubStatus_de_VeragAG.Location = New System.Drawing.Point(605, 251) 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) @@ -977,7 +1060,7 @@ Partial Class frmMain ' 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(385, 215) + Me.Label30.Location = New System.Drawing.Point(385, 235) Me.Label30.Name = "Label30" Me.Label30.Size = New System.Drawing.Size(92, 13) Me.Label30.TabIndex = 1 @@ -987,7 +1070,7 @@ Partial Class frmMain ' 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(523, 214) + Me.Label31.Location = New System.Drawing.Point(523, 234) Me.Label31.Name = "Label31" Me.Label31.Size = New System.Drawing.Size(108, 13) Me.Label31.TabIndex = 1 @@ -1039,7 +1122,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(646, 405) + Me.ClientSize = New System.Drawing.Size(646, 430) Me.Controls.Add(Me.Panel2) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.MinimizeBox = False @@ -1135,4 +1218,10 @@ Partial Class frmMain Friend WithEvents lblAtTagImex As Label Friend WithEvents lblAt_woche_StatusImex As Label Friend WithEvents lblAt_tag_StatusImex As Label + Friend WithEvents cbxBrg_at_Atilla As CheckBox + Friend WithEvents lblBrg_at_Atilla As Label + Friend WithEvents lblAtWocheAtilla As Label + Friend WithEvents lblAtTagAtilla As Label + Friend WithEvents lblAt_woche_StatusAtilla As Label + Friend WithEvents lblAt_tag_StatusAtilla As Label End Class diff --git a/VERAGMonitoring/frmMain.vb b/VERAGMonitoring/frmMain.vb index e0fc7fe..9669c9a 100644 --- a/VERAGMonitoring/frmMain.vb +++ b/VERAGMonitoring/frmMain.vb @@ -85,6 +85,7 @@ Public Class frmMain cbxBrg_de2_VeragAG.Enabled = False cbxBrg_at_VeragAG.Checked = False cbxBrg_de2_VeragAG.Checked = False + cbxBrg_at_Atilla.Enabled = False cbxAufschub_de_VeragAG.Checked = False cbxAufschub_at_VeragAG.Checked = False cbxAufschub_at_VeragCS.Checked = False @@ -175,6 +176,7 @@ Public Class frmMain Dim brg_DE As String = "05DE0000000009345" Dim brg_DE_NEU As String = "17DE0000000071678" Dim brg_AT_IMEX As String = "16AT520000G000VA6" + Dim brg_AT_ATILLA As String = "20AT520000G000092" 'If cbxBrg_de_VeragAG.Checked Then 'DE ' 'DE WOCHE @@ -251,8 +253,37 @@ Public Class frmMain setLabel(lblAtWocheImex, "0.0") setLabel(lblAtTagImex, "0.0") End If - If cbxBrg_at_Imex.Checked Then setAlarm("AT - gVV - HZA Linz/Wels Tagessaldo", "9", Me.lblAtTagImex, cMonitoringBrg.brgusrset_gvvAt_imex_tag_warn1, cMonitoringBrg.brgusrset_gvvAt_imex_tag_warn2, cMonitoringBrg.brgusrset_gvvAt_imex_de_summe, lblAt_tag_StatusImex) - If cbxBrg_at_Imex.Checked Then setAlarm("AT - gVV - HZA Linz/Wels Wochenreferenzsumme ", "9", Me.lblAtWocheImex, cMonitoringBrg.brgusrset_gvvAt_imex_woche_warn1, cMonitoringBrg.brgusrset_gvvAt_imex_woche_warn2, cMonitoringBrg.brgusrset_gvvAt_imex_de_summe, lblAt_woche_StatusImex) + If cbxBrg_at_Imex.Checked Then setAlarm("IMEX | AT - gVV - HZA Linz/Wels Tagessaldo", "9", Me.lblAtTagImex, cMonitoringBrg.brgusrset_gvvAt_imex_tag_warn1, cMonitoringBrg.brgusrset_gvvAt_imex_tag_warn2, cMonitoringBrg.brgusrset_gvvAt_imex_de_summe, lblAt_tag_StatusImex) + If cbxBrg_at_Imex.Checked Then setAlarm("IMEX | AT - gVV - HZA Linz/Wels Wochenreferenzsumme ", "9", Me.lblAtWocheImex, cMonitoringBrg.brgusrset_gvvAt_imex_woche_warn1, cMonitoringBrg.brgusrset_gvvAt_imex_woche_warn2, cMonitoringBrg.brgusrset_gvvAt_imex_de_summe, lblAt_woche_StatusImex) + + + + If cbxBrg_at_Atilla.Checked Then 'AT ATILLA + 'ATLAS AT WOCHE + Dim AtWoche_atlas As Double = BRG.getBrgSumFromFMZOLL_Zabis(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_AT_ATILLA) + 'ZOLARIS AT WOCHE + Dim AtWoche_zolaris As Double = BRG.getBrgSumFromFMZOLL_Zolaris(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_AT_ATILLA) + 'TELOTEC AT WOCHE + Dim AtWoche_TELOTEC As Double = BRG.getBrgSumFromFMZOLL_TELOTEC(Now.AddDays(-6).ToShortDateString, Now.ToShortDateString, "50", "60", brg_AT_ATILLA) + 'AT WOCHE + Dim woche_at As Double = AtWoche_atlas + AtWoche_zolaris + AtWoche_TELOTEC + setLabel(lblAtWocheAtilla, 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_ATILLA, " 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_ATILLA) + 'TELOTEC AT TAG + Dim AtTag_telotec As Double = BRG.getBrgSumFromFMZOLL_TELOTEC(Now.AddMonths(-3).ToShortDateString, Now.ToShortDateString, "50", "50", brg_AT_ATILLA) + 'AT TAG + Dim tag_at As Double = AtTag_zolaris + AtTag_atlas + AtTag_telotec + setLabel(lblAtTagAtilla, String.Format("{0:C}", CDbl(tag_at))) + Else + setLabel(lblAtWocheAtilla, "0.0") + setLabel(lblAtTagAtilla, "0.0") + End If + If cbxBrg_at_Atilla.Checked Then setAlarm("ATILLA | AT - gVV - HZA Linz/Wels Tagessaldo", "9", Me.lblAtTagAtilla, cMonitoringBrg.brgusrset_gvvAt_ATILLA_tag_warn1, cMonitoringBrg.brgusrset_gvvAt_ATILLA_tag_warn2, cMonitoringBrg.brgusrset_gvvAt_ATILLA_de_summe, lblAt_tag_StatusAtilla) + 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_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) @@ -610,6 +641,7 @@ Public Class frmMain ' lblBrg_de_VeragAG.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_gvvDe_summe) & ")" If cbxBrg_de2_VeragAG.Checked Then lblBrg_de2_VeragAG.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_gvvDe2_summe) & ")" lblBrg_at_Imex.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_gvvAt_imex_de_summe) & ")" + lblBrg_at_atilla.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_gvvAt_ATILLA_de_summe) & ")" lblAufschub_de_VeragAG.Text &= " (" & String.Format("{0:C}", cMonitoringBrg.brgusrset_aufschub_AG_de_summe) & ")" @@ -942,7 +974,17 @@ Public Class frmMain frmShowData.Label2.Text = "Anzahl: " & frmShowData.dgv.RowCount 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() + 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() + End Sub End Class diff --git a/VERAGMonitoring/frmSettings.Designer.vb b/VERAGMonitoring/frmSettings.Designer.vb index c4524fd..679d6b0 100644 --- a/VERAGMonitoring/frmSettings.Designer.vb +++ b/VERAGMonitoring/frmSettings.Designer.vb @@ -131,7 +131,7 @@ Partial Class frmSettings ' 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(20, 183) + Me.Label7.Location = New System.Drawing.Point(20, 215) Me.Label7.Name = "Label7" Me.Label7.Size = New System.Drawing.Size(99, 13) Me.Label7.TabIndex = 14 @@ -141,7 +141,7 @@ Partial Class frmSettings ' Me.Label18.AutoSize = True Me.Label18.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label18.Location = New System.Drawing.Point(22, 268) + Me.Label18.Location = New System.Drawing.Point(22, 300) Me.Label18.Name = "Label18" Me.Label18.Size = New System.Drawing.Size(239, 13) Me.Label18.TabIndex = 15 @@ -151,7 +151,7 @@ Partial Class frmSettings ' Me.Label6.AutoSize = True Me.Label6.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label6.Location = New System.Drawing.Point(22, 248) + Me.Label6.Location = New System.Drawing.Point(22, 280) Me.Label6.Name = "Label6" Me.Label6.Size = New System.Drawing.Size(260, 13) Me.Label6.TabIndex = 4 @@ -181,7 +181,7 @@ Partial Class frmSettings ' Me.Label21.AutoSize = True Me.Label21.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label21.Location = New System.Drawing.Point(22, 228) + Me.Label21.Location = New System.Drawing.Point(22, 260) Me.Label21.Name = "Label21" Me.Label21.Size = New System.Drawing.Size(217, 13) Me.Label21.TabIndex = 9 @@ -191,7 +191,7 @@ Partial Class frmSettings ' Me.Label5.AutoSize = True Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label5.Location = New System.Drawing.Point(22, 208) + Me.Label5.Location = New System.Drawing.Point(22, 240) Me.Label5.Name = "Label5" Me.Label5.Size = New System.Drawing.Size(215, 13) Me.Label5.TabIndex = 8 @@ -247,28 +247,28 @@ Partial Class frmSettings ' 'txtAufschub_de_VeragAG_summe ' - Me.txtAufschub_de_VeragAG_summe.Location = New System.Drawing.Point(335, 205) + Me.txtAufschub_de_VeragAG_summe.Location = New System.Drawing.Point(335, 237) Me.txtAufschub_de_VeragAG_summe.Name = "txtAufschub_de_VeragAG_summe" Me.txtAufschub_de_VeragAG_summe.Size = New System.Drawing.Size(113, 20) Me.txtAufschub_de_VeragAG_summe.TabIndex = 17 ' 'txtAufschub_at_VeragAG_summe ' - Me.txtAufschub_at_VeragAG_summe.Location = New System.Drawing.Point(335, 225) + Me.txtAufschub_at_VeragAG_summe.Location = New System.Drawing.Point(335, 257) Me.txtAufschub_at_VeragAG_summe.Name = "txtAufschub_at_VeragAG_summe" Me.txtAufschub_at_VeragAG_summe.Size = New System.Drawing.Size(113, 20) Me.txtAufschub_at_VeragAG_summe.TabIndex = 17 ' 'txtAufschub_at_VeragCS_summe ' - Me.txtAufschub_at_VeragCS_summe.Location = New System.Drawing.Point(335, 245) + Me.txtAufschub_at_VeragCS_summe.Location = New System.Drawing.Point(335, 277) Me.txtAufschub_at_VeragCS_summe.Name = "txtAufschub_at_VeragCS_summe" Me.txtAufschub_at_VeragCS_summe.Size = New System.Drawing.Size(113, 20) Me.txtAufschub_at_VeragCS_summe.TabIndex = 17 ' 'txtAufschub_at_VeragZS_summe ' - Me.txtAufschub_at_VeragZS_summe.Location = New System.Drawing.Point(335, 265) + Me.txtAufschub_at_VeragZS_summe.Location = New System.Drawing.Point(335, 297) Me.txtAufschub_at_VeragZS_summe.Name = "txtAufschub_at_VeragZS_summe" Me.txtAufschub_at_VeragZS_summe.Size = New System.Drawing.Size(113, 20) Me.txtAufschub_at_VeragZS_summe.TabIndex = 17 @@ -277,7 +277,7 @@ Partial Class frmSettings ' 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(332, 189) + Me.Label8.Location = New System.Drawing.Point(332, 221) Me.Label8.Name = "Label8" Me.Label8.Size = New System.Drawing.Size(116, 13) Me.Label8.TabIndex = 11 @@ -371,7 +371,7 @@ Partial Class frmSettings ' Me.Label16.AutoSize = True Me.Label16.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label16.Location = New System.Drawing.Point(481, 189) + Me.Label16.Location = New System.Drawing.Point(481, 221) Me.Label16.Name = "Label16" Me.Label16.Size = New System.Drawing.Size(73, 13) Me.Label16.TabIndex = 11 @@ -381,7 +381,7 @@ Partial Class frmSettings ' Me.Label19.AutoSize = True Me.Label19.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label19.Location = New System.Drawing.Point(587, 189) + Me.Label19.Location = New System.Drawing.Point(587, 221) Me.Label19.Name = "Label19" Me.Label19.Size = New System.Drawing.Size(73, 13) Me.Label19.TabIndex = 11 @@ -389,56 +389,56 @@ Partial Class frmSettings ' 'txtAufschub_de_VeragAG_warn1 ' - Me.txtAufschub_de_VeragAG_warn1.Location = New System.Drawing.Point(484, 205) + Me.txtAufschub_de_VeragAG_warn1.Location = New System.Drawing.Point(484, 237) Me.txtAufschub_de_VeragAG_warn1.Name = "txtAufschub_de_VeragAG_warn1" Me.txtAufschub_de_VeragAG_warn1.Size = New System.Drawing.Size(100, 20) Me.txtAufschub_de_VeragAG_warn1.TabIndex = 17 ' 'txtAufschub_de_VeragAG_warn2 ' - Me.txtAufschub_de_VeragAG_warn2.Location = New System.Drawing.Point(590, 205) + Me.txtAufschub_de_VeragAG_warn2.Location = New System.Drawing.Point(590, 237) Me.txtAufschub_de_VeragAG_warn2.Name = "txtAufschub_de_VeragAG_warn2" Me.txtAufschub_de_VeragAG_warn2.Size = New System.Drawing.Size(100, 20) Me.txtAufschub_de_VeragAG_warn2.TabIndex = 17 ' 'txtAufschub_at_VeragAG_warn1 ' - Me.txtAufschub_at_VeragAG_warn1.Location = New System.Drawing.Point(484, 225) + Me.txtAufschub_at_VeragAG_warn1.Location = New System.Drawing.Point(484, 257) Me.txtAufschub_at_VeragAG_warn1.Name = "txtAufschub_at_VeragAG_warn1" Me.txtAufschub_at_VeragAG_warn1.Size = New System.Drawing.Size(100, 20) Me.txtAufschub_at_VeragAG_warn1.TabIndex = 17 ' 'txtAufschub_at_VeragAG_warn2 ' - Me.txtAufschub_at_VeragAG_warn2.Location = New System.Drawing.Point(590, 225) + Me.txtAufschub_at_VeragAG_warn2.Location = New System.Drawing.Point(590, 257) Me.txtAufschub_at_VeragAG_warn2.Name = "txtAufschub_at_VeragAG_warn2" Me.txtAufschub_at_VeragAG_warn2.Size = New System.Drawing.Size(100, 20) Me.txtAufschub_at_VeragAG_warn2.TabIndex = 17 ' 'txtAufschub_at_VeragCS_warn1 ' - Me.txtAufschub_at_VeragCS_warn1.Location = New System.Drawing.Point(484, 245) + Me.txtAufschub_at_VeragCS_warn1.Location = New System.Drawing.Point(484, 277) Me.txtAufschub_at_VeragCS_warn1.Name = "txtAufschub_at_VeragCS_warn1" Me.txtAufschub_at_VeragCS_warn1.Size = New System.Drawing.Size(100, 20) Me.txtAufschub_at_VeragCS_warn1.TabIndex = 17 ' 'txtAufschub_at_VeragCS_warn2 ' - Me.txtAufschub_at_VeragCS_warn2.Location = New System.Drawing.Point(590, 245) + Me.txtAufschub_at_VeragCS_warn2.Location = New System.Drawing.Point(590, 277) Me.txtAufschub_at_VeragCS_warn2.Name = "txtAufschub_at_VeragCS_warn2" Me.txtAufschub_at_VeragCS_warn2.Size = New System.Drawing.Size(100, 20) Me.txtAufschub_at_VeragCS_warn2.TabIndex = 17 ' 'txtAufschub_at_VeragZS_warn1 ' - Me.txtAufschub_at_VeragZS_warn1.Location = New System.Drawing.Point(484, 265) + Me.txtAufschub_at_VeragZS_warn1.Location = New System.Drawing.Point(484, 297) Me.txtAufschub_at_VeragZS_warn1.Name = "txtAufschub_at_VeragZS_warn1" Me.txtAufschub_at_VeragZS_warn1.Size = New System.Drawing.Size(100, 20) Me.txtAufschub_at_VeragZS_warn1.TabIndex = 17 ' 'txtAufschub_at_VeragZS_warn2 ' - Me.txtAufschub_at_VeragZS_warn2.Location = New System.Drawing.Point(590, 265) + Me.txtAufschub_at_VeragZS_warn2.Location = New System.Drawing.Point(590, 297) Me.txtAufschub_at_VeragZS_warn2.Name = "txtAufschub_at_VeragZS_warn2" Me.txtAufschub_at_VeragZS_warn2.Size = New System.Drawing.Size(100, 20) Me.txtAufschub_at_VeragZS_warn2.TabIndex = 17 @@ -447,7 +447,7 @@ Partial Class frmSettings ' Me.Label20.AutoSize = True Me.Label20.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label20.Location = New System.Drawing.Point(22, 304) + Me.Label20.Location = New System.Drawing.Point(22, 336) Me.Label20.Name = "Label20" Me.Label20.Size = New System.Drawing.Size(151, 13) Me.Label20.TabIndex = 11 @@ -457,7 +457,7 @@ Partial Class frmSettings ' Me.Label22.AutoSize = True Me.Label22.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label22.Location = New System.Drawing.Point(22, 319) + Me.Label22.Location = New System.Drawing.Point(22, 351) Me.Label22.Name = "Label22" Me.Label22.Size = New System.Drawing.Size(248, 13) Me.Label22.TabIndex = 11 @@ -467,7 +467,7 @@ Partial Class frmSettings ' Me.Label23.AutoSize = True Me.Label23.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label23.Location = New System.Drawing.Point(22, 334) + Me.Label23.Location = New System.Drawing.Point(22, 366) Me.Label23.Name = "Label23" Me.Label23.Size = New System.Drawing.Size(208, 13) Me.Label23.TabIndex = 11 @@ -477,7 +477,7 @@ Partial Class frmSettings ' Me.Label24.AutoSize = True Me.Label24.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label24.Location = New System.Drawing.Point(22, 289) + Me.Label24.Location = New System.Drawing.Point(22, 321) Me.Label24.Name = "Label24" Me.Label24.Size = New System.Drawing.Size(76, 13) Me.Label24.TabIndex = 11 @@ -486,7 +486,7 @@ Partial Class frmSettings 'Button3 ' Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button3.Location = New System.Drawing.Point(683, 322) + Me.Button3.Location = New System.Drawing.Point(683, 354) Me.Button3.Name = "Button3" Me.Button3.Size = New System.Drawing.Size(103, 23) Me.Button3.TabIndex = 18 @@ -523,7 +523,7 @@ Partial Class frmSettings ' 'btnSaveToDB ' - Me.btnSaveToDB.Location = New System.Drawing.Point(508, 322) + Me.btnSaveToDB.Location = New System.Drawing.Point(508, 354) Me.btnSaveToDB.Name = "btnSaveToDB" Me.btnSaveToDB.Size = New System.Drawing.Size(142, 23) Me.btnSaveToDB.TabIndex = 19 @@ -579,7 +579,7 @@ Partial Class frmSettings ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(803, 357) + Me.ClientSize = New System.Drawing.Size(803, 388) Me.Controls.Add(Me.txtBrgVV_at_imex_woche_warn2) Me.Controls.Add(Me.txtBrgVV_at_imex_tag_warn2) Me.Controls.Add(Me.txtBrgVV_at_imex_woche_warn1)