neu

2020-08-04 16:35:31 +02:00
parent 853d96140f
commit 41b13fe4b0
38 changed files with 603 additions and 256 deletions
--- a/VERAGMonitoring/cSqlDb.vb
+++ b/VERAGMonitoring/cSqlDb.vb
@@ -4,38 +4,38 @@ Imports System.Data.SqlClient


 Public Class cSqlDb
-    Public Shared Function GetNewOpenConnection() As SqlConnection
-        Dim cn As New SqlConnection()
-        cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" 'BUCHHALTUNG
-        cn.Open()
-        Return cn
-    End Function
-    Public Shared Function GetNewOpenConnectionFMZOLL() As SqlConnection
-        Dim cn As New SqlConnection()
-        cn.ConnectionString = "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;" ' FMZOLL
-        'cn.ConnectionString = "Data Source=192.168.0.50\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;" 'DEVELOPER
-        cn.Open()
-        Return cn
-    End Function
-    Public Shared Function GetNewOpenConnectionZOLARIS() As SqlConnection
-        Dim cn As New SqlConnection()
-        cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956;" 'BUCHHALTUNG
-        cn.Open()
-        Return cn
-    End Function
+    '    Public Shared Function GetNewOpenConnectionADMIN() As SqlConnection
+    '        Dim cn As New SqlConnection()
+    '        cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" 'BUCHHALTUNG
+    '        cn.Open()
+    '        Return cn
+    '    End Function
+    '    Public Shared Function GetNewOpenConnectionFMZOLL() As SqlConnection
+    '        Dim cn As New SqlConnection()
+    '        cn.ConnectionString = "Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;" ' FMZOLL
+    '        'cn.ConnectionString = "Data Source=192.168.0.50\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;" 'DEVELOPER
+    '        cn.Open()
+    '        Return cn
+    '    End Function
+    '    Public Shared Function GetNewOpenConnectionZOLARIS() As SqlConnection
+    '        Dim cn As New SqlConnection()
+    '        cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956;" 'BUCHHALTUNG
+    '        cn.Open()
+    '        Return cn
+    '    End Function

-    Public Shared Function GetNewOpenConnectionAtlasSUB() As SqlConnection
-        Dim cn As New SqlConnection()
-        cn.ConnectionString = "Data Source=192.168.0.95\SQLATLAS;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=sa;" 'VERAG-ATLAS1
-        cn.Open()
-        Return cn
-    End Function
-    Public Shared Function GetNewOpenConnectionAtlasSBG() As SqlConnection
-        Dim cn As New SqlConnection()
-        cn.ConnectionString = "Data Source=192.168.133.98;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=????;" 'verag-atlas3
-        cn.Open()
-        Return cn
-    End Function
+    '    Public Shared Function GetNewOpenConnectionAtlasSUB() As SqlConnection
+    '        Dim cn As New SqlConnection()
+    '        cn.ConnectionString = "Data Source=192.168.0.95\SQLATLAS;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=sa;" 'VERAG-ATLAS1
+    '        cn.Open()
+    '        Return cn
+    '    End Function
+    '    Public Shared Function GetNewOpenConnectionAtlasSBG() As SqlConnection
+    '        Dim cn As New SqlConnection()
+    '        cn.ConnectionString = "Data Source=192.168.133.98;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=????;" 'verag-atlas3
+    '        cn.Open()
+    '        Return cn
+    '    End Function
 End Class


@@ -49,7 +49,7 @@ Public Class cLogin
    Public Function getAktuelleVersion() As String
        Dim sql As String = "SELECT prog_aktuelleVersion FROM tblProgramme WHERE prog_codename=@codename"
        Dim dr As SqlDataReader
-        Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
+        Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
            Using cmd As New SqlCommand(sql, conn)
                cmd.Parameters.AddWithValue("@codename", "MONITORING")
                dr = cmd.ExecuteReader()
@@ -126,7 +126,7 @@ Public Class cBrgDb
        While True  'Endlosschleife; wird verlassen durch Return oder Application.Exit()
            Try
                Dim myTable = New DataTable()
-                Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
+                Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
                    Using cmd As New SqlCommand(sql & where, conn)
                        cmd.Parameters.AddWithValue("@datumVon", datumVon)
                        cmd.Parameters.AddWithValue("@datumBis", datumBis)
@@ -150,7 +150,7 @@ Public Class cBrgDb
    Public Function loadDgv(sql As String) As DataTable
        Try
            Dim myTable = New DataTable()
-            Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
+            Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
                Using cmd As New SqlCommand(sql, conn)
                    Dim dr As SqlDataReader = cmd.ExecuteReader()
                    myTable.Load(dr)
@@ -170,7 +170,7 @@ Public Class cBrgDb
    Public Function delBrgAufschubEinzahlung(id As String) As Boolean
        Try
            Dim myTable = New DataTable()
-            Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
+            Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
                Using cmd As New SqlCommand("DELETE FROM tblBrgAufschub  WHERE brgak_id= '" & id & "'", conn)
                    cmd.ExecuteReader()
                    Return True
@@ -193,7 +193,7 @@ Public Class cBrgDb
        While True  'Endlosschleife; wird verlassen durch Return oder Application.Exit()
            Try
                Dim myTable = New DataTable()
-                Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
+                Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
                    Using cmd As New SqlCommand(sql, conn)
                        Dim dr As SqlDataReader = cmd.ExecuteReader()
                        myTable.Load(dr)
@@ -219,7 +219,7 @@ Public Class cBrgDb
        While True  'Endlosschleife; wird verlassen durch Return oder Application.Exit()
            Try
                Dim myTable = New DataTable()
-                Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL()
+                Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL()
                    Using cmd As New SqlCommand(sql, conn)
                        Dim dr As SqlDataReader = cmd.ExecuteReader()
                        myTable.Load(dr)
@@ -243,7 +243,7 @@ Public Class cBrgDb
        While True  'Endlosschleife; wird verlassen durch Return oder Application.Exit()
            Try
                Dim myTable = New DataTable()
-                Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL()
+                Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL()
                    Using cmd As New SqlCommand(sql, conn)
                        Dim dr As SqlDataReader = cmd.ExecuteReader()
                        myTable.Load(dr)
@@ -269,7 +269,7 @@ Public Class cBrgDb
        While True  'Endlosschleife; wird verlassen durch Return oder Application.Exit()
            Try
                Dim myTable = New DataTable()
-                Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL()
+                Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL()
                    Using cmd As New SqlCommand(sql, conn)
                        Dim dr As SqlDataReader = cmd.ExecuteReader()
                        myTable.Load(dr)
@@ -298,7 +298,36 @@ Public Class cBrgDb
        While True  'Endlosschleife; wird verlassen durch Return oder Application.Exit()
            Try
                Dim myTable = New DataTable()
-                Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL()
+                Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL()
+                    Using cmd As New SqlCommand(sql, conn)
+                        Dim dr As SqlDataReader = cmd.ExecuteReader()
+                        myTable.Load(dr)
+                        dr.Close()
+                    End Using
+                    conn.Close()
+                End Using
+                Return myTable  'While Schleife wird hier verlassen
+            Catch ex As Exception
+                Dim antwort As MsgBoxResult = MsgBox(ex.Message, CType(MsgBoxStyle.RetryCancel + MsgBoxStyle.Exclamation, MsgBoxStyle),
+                                              "Problem in Function 'loadDgvBySqlZOLARIS'")
+            End Try
+        End While
+
+        Return Nothing
+    End Function
+
+
+
+    Public Function loadDgvBySqlFromBrgKt_NCTS_TR_Details(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As DataTable
+        Dim sql As String = "SELECT ncts_MRN,ncts_Status,(nctsSA_AbgabenBetrag), ncts_dyaAnmID, ncts_ArtAnmeldung,nctsSA_GRN,ncts_Empfaenger_eori,ncts_Empfaenger_NLNR,ncts_Empfaenger_Name,ncts_Bearbeiter"
+        sql &= "  ,[ncts_ObjectName],[ncts_Trans_DatumZeit] as Transaktionsdatum,[ncts_dyaArt],[ncts_ANR],[ncts_MRN],[ncts_ObjectAlias],[ncts_GesamtRohmasse],[ncts_GesamtAnzahlPackstuecke] "
+        sql &= " from tblNCTS_TR_Sicherheitsangaben inner join tblNCTS_TR on ncts_Id = nctsSA_NctsId"
+        sql &= " where ncts_Status between '" & statusVon & "' and '" & statusBis & "' AND nctsSA_GRN='" & buergschaft & "' " & where
+        'MsgBox(sql)
+        While True  'Endlosschleife; wird verlassen durch Return oder Application.Exit()
+            Try
+                Dim myTable = New DataTable()
+                Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL()
                    Using cmd As New SqlCommand(sql, conn)
                        Dim dr As SqlDataReader = cmd.ExecuteReader()
                        myTable.Load(dr)
@@ -325,7 +354,7 @@ Public Class cBrgDb
        While True  'Endlosschleife; wird verlassen durch Return oder Application.Exit()
            Try
                Dim myTable = New DataTable()
-                Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL()
+                Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL()
                    Using cmd As New SqlCommand(sql, conn)
                        Dim dr As SqlDataReader = cmd.ExecuteReader()
                        myTable.Load(dr)
@@ -346,7 +375,7 @@ Public Class cBrgDb
    Public Function checkUser(pcname, brgusr_name) As Boolean
        Dim sql As String = " SELECT * FROM tblBrgUser WHERE brgusr_name = @brgusr_name "
        Dim dr As SqlDataReader
-        Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
+        Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
            Using cmd As New SqlCommand(sql, conn)
                cmd.Parameters.AddWithValue("@brgusr_name", pcname & "\" & brgusr_name)
                dr = cmd.ExecuteReader()
@@ -374,7 +403,7 @@ Public Class cBrgDb

    Public Function insertBrgAufschubEinzahlung(brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc) As Boolean
        Try
-            Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
+            Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
                Using cmd As New SqlCommand("INSERT INTO tblBrgAufschub " &
                                            " (brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc, brgak_art) VALUES" &
                                            " (@brgak_datum, @brgak_betrag, @brgak_brgaktoId, @brgak_filename, @brgak_atc,'einzahlung') ", conn)
@@ -401,7 +430,7 @@ Public Class cBrgDb

    Public Function insertBrgAufschubAusgleichsbetrag(brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc) As Boolean
        Try
-            Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
+            Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
                Using cmd As New SqlCommand("INSERT INTO tblBrgAufschub " &
                                            " (brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc, brgak_art) VALUES" &
                                            " (@brgak_datum, @brgak_betrag, @brgak_brgaktoId, @brgak_filename, @brgak_atc,'Ausgleichsbetrag') ", conn)
@@ -429,7 +458,7 @@ Public Class cBrgDb

    Public Function deleteBrgAufschubAusgleichsbetrag(brgak_brgaktoId) As Boolean
        Try
-            Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
+            Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
                Using cmd As New SqlCommand("DELETE FROM tblBrgAufschub " &
                                            " WHERE brgak_art='Ausgleichsbetrag' AND brgak_brgaktoId=@brgak_brgaktoId", conn)
                    cmd.Parameters.AddWithValue("@brgak_brgaktoId", brgak_brgaktoId)
@@ -451,7 +480,7 @@ Public Class cBrgDb

    Public Function insertBrgAufschubZuBelastung(brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc) As Boolean
        Try
-            Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
+            Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
                Using cmd As New SqlCommand("INSERT INTO tblBrgAufschub " &
                                            " (brgak_datum, brgak_betrag, brgak_brgaktoId, brgak_filename, brgak_atc, brgak_art) VALUES" &
                                            " (@brgak_datum, @brgak_betrag, @brgak_brgaktoId, @brgak_filename, @brgak_atc,'belastung') ", conn)
@@ -492,6 +521,16 @@ Public Class cBrgDb


    End Function
+
+
+    Public Function getBrgSumFromFMZOLL_NCTS_TR(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As String
+
+        Dim tmp_DY As String = getBrgSumFrom_NCTS_TR(datumVon, datumBis, statusVon, statusBis, buergschaft, where)
+        Return CDbl(tmp_DY)
+
+
+    End Function
+
    Public Function getBrgSumFromFMZOLL_Zabis_SUBEN(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As String
        Return Nothing
        Dim sql As String = "SELECT SUM(veoerz_sicbtg) " &
@@ -500,7 +539,7 @@ Public Class cBrgDb
        '  Dim daten As New List(Of cEntry)
        Dim dr As SqlDataReader
        Dim daten As New List(Of cBuergschaft)
-        Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL()
+        Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL()
            Using cmd As New SqlCommand(sql, conn)
                dr = cmd.ExecuteReader()
                Try
@@ -532,7 +571,39 @@ Public Class cBrgDb
        'MsgBox(sql)
        Dim dr As SqlDataReader
        Dim daten As New List(Of cBuergschaft)
-        Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL()
+        Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL()
+            Using cmd As New SqlCommand(sql, conn)
+                dr = cmd.ExecuteReader()
+                Try
+                    Dim cnt As Integer = 0
+                    If dr.Read Then
+                        If Not dr.GetValue(0) Is DBNull.Value Then
+                            '   MsgBox(dr.GetValue(0))
+                            Return dr.GetValue(0)
+
+                        End If
+                    End If
+                    Return "0"
+                Catch ex As Exception
+                    MsgBox(System.Reflection.MethodInfo.GetCurrentMethod.Name & ": Fehler mit der Datenbankverbindung:" & vbCrLf & vbCrLf & ex.Message, vbExclamation, "Datenbankfehler")
+                Finally
+                    dr.Close()
+                End Try
+            End Using
+        End Using
+        Return Nothing
+    End Function
+
+
+    Public Function getBrgSumFrom_NCTS_TR(ByVal datumVon As DateTime, ByVal datumBis As DateTime, ByVal statusVon As String, ByVal statusBis As String, ByVal buergschaft As String, Optional where As String = "") As String
+        'Return Nothing
+        Dim sql As String = "SELECT sum(nctsSA_AbgabenBetrag)"
+        sql &= " from tblNCTS_TR_Sicherheitsangaben inner join [tblNCTS_TR] on ncts_Id = nctsSA_NctsId"
+        sql &= " where [ncts_Eroeffnung] BETWEEN '" & datumVon.ToShortDateString & " 00:00:00' AND '" & datumBis.ToShortDateString & " 23:23:59' AND ncts_Status BETWEEN '" & statusVon & "' AND '" & statusBis & "'  AND nctsSA_GRN = '" & buergschaft & "' " & where
+        'MsgBox(sql)
+        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)
                dr = cmd.ExecuteReader()
                Try
@@ -564,7 +635,7 @@ Public Class cBrgDb
        'MsgBox(sql)
        Dim dr As SqlDataReader
        Dim daten As New List(Of cBuergschaft)
-        Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL()
+        Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL()
            Using cmd As New SqlCommand(sql, conn)
                dr = cmd.ExecuteReader()
                Try
@@ -595,7 +666,7 @@ Public Class cBrgDb
        '  Dim daten As New List(Of cEntry)
        Dim dr As SqlDataReader
        Dim daten As New List(Of cBuergschaft)
-        Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL()
+        Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL()
            Using cmd As New SqlCommand(sql, conn)
                dr = cmd.ExecuteReader()
                Try
@@ -628,7 +699,7 @@ Public Class cBrgDb
        '  Dim daten As New List(Of cEntry)
        Dim dr As SqlDataReader
        Dim daten As New List(Of cBuergschaft)
-        Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
+        Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
            Using cmd As New SqlCommand(sql, conn)
                dr = cmd.ExecuteReader()
                Try
@@ -696,7 +767,7 @@ Public Class cBrgDb
            '  Dim daten As New List(Of cEntry)
            Dim dr As SqlDataReader
            Dim daten As New List(Of cBuergschaft)
-            Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
+            Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
                Using cmd As New SqlCommand(sql, conn)
                    cmd.Parameters.AddWithValue("@datumVon", datumVon)
                    cmd.Parameters.AddWithValue("@datumBis", datumBis)
@@ -734,7 +805,7 @@ Public Class cBrgDb
        Dim dr As SqlDataReader
        Dim daten As New List(Of cBuergschaft)
        Dim cMonitoringBrg As New cMonitoringBrg
-        Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
+        Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
            Using cmd As New SqlCommand(sql, conn)
                dr = cmd.ExecuteReader()
                Try
@@ -810,7 +881,7 @@ Public Class cBrgDb
                         " 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   " &
                            " WHERE brgusrset_id=@brgusrset_id "

-        Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
+        Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
            Using cmd As New SqlCommand(sql, conn)
                'msgbo
                cmd.Parameters.AddWithValue("@brgusrset_id", d.brgusrset_id)
@@ -871,7 +942,7 @@ Public Class cBrgDb
        '  Dim daten As New List(Of cEntry)
        Dim dr As SqlDataReader
        Dim daten As New List(Of cBuergschaft)
-        Using conn As SqlConnection = cSqlDb.GetNewOpenConnectionFMZOLL()
+        Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionFMZOLL()
            Using cmd As New SqlCommand(sql, conn)
                dr = cmd.ExecuteReader()
                Try
@@ -910,9 +981,11 @@ Public Class cBrgDb
                                " End " &
                           " commit tran "

-        Dim cn As New SqlConnection()
-        cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;"
-        cn.Open()
+        'Dim cn As New SqlConnection()
+        'cn.ConnectionString = "Data Source=SQLGUIDE01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;"
+        'cn.Open()
+
+        Dim cn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN
        Using cn
            Using cmd As New SqlCommand(sql, cn)
                cmd.Parameters.AddWithValue("@brgmld_date", brgmld_date)
@@ -935,7 +1008,7 @@ Public Class cBrgDb
        Dim sql As String = " SELECT * FROM tblBrgMeldungen WHERE brgmld_date = @brgmld_date AND brgmld_kto=@brgmld_kto AND brgmld_user=@brgmld_user AND brgmld_stufe=@brgmld_stufe  "

        Dim dr As SqlDataReader
-        Using conn As SqlConnection = cSqlDb.GetNewOpenConnection()
+        Using conn As SqlConnection = VERAG_PROG_ALLGEMEIN.SQL.GetNewOpenConnectionADMIN()
            Using cmd As New SqlCommand(sql, conn)
                cmd.Parameters.AddWithValue("@brgmld_date", brgmld_date)
                cmd.Parameters.AddWithValue("@brgmld_kto", brgmld_kto)