diff --git a/Dokumentation/Classes/Class1.vb b/Dokumentation/Classes/Class1.vb index 1a552dc..b940b9a 100644 --- a/Dokumentation/Classes/Class1.vb +++ b/Dokumentation/Classes/Class1.vb @@ -8,8 +8,9 @@ Public Class Class1 'Public Shared DBConString As String = "Server=NBMIESENBECK\SPIELWIESE;Initial Catalog=Doku;User ID=sa;Password=verag#3;Connection Timeout=5;" Public Shared DBConString As String Public Shared DBConstringDev As String = "Server=DEVELOPER.verag.ost.dmn\DEVSQL;Initial Catalog=Doku;User ID=sa;Password=BmWr501956;Connection Timeout=5;" - Public Shared DBADMINBuchhaltung As String = "Data Source=BUCHHALTUNG.verag.ost.dmn\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" - Public Shared DBDoku As String = "Server=SQLCluster.verag.ost.dmn\Verag;Initial Catalog=Doku;User ID=sa;Password=BmWr501956;Connection Timeout=5;" + Public Shared DBADMINBuchhaltung As String = "Data Source=SQLGuide01.verag.ost.dmn;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" + Public Shared DBAdmin As String = "[SQLGuide01.verag.ost.dmn].ADMIN" + Public Shared DBDoku As String = "Server=SQLGuide01.verag.ost.dmn\Verag;Initial Catalog=Doku;User ID=sa;Password=BmWr501956;Connection Timeout=5;" 'Public Shared DBDoku As String = "Server=dokusql.verag.ost.dmn\sqlexpress;Initial Catalog=Doku;User ID=sa;Password=BmWr501956;Connection Timeout=5;" Public Shared DBDokuTest As String = "Server=DEVELOPER.verag.ost.dmn\DEVSQL;Initial Catalog=Doku;User ID=sa;Password=BmWr501956;Connection Timeout=5;" 'Public Shared FilePath As String = "\\192.168.0.253\backup\temp_Sebastian\Spielwiese\Doku" @@ -31,7 +32,7 @@ Public Class Class1 Public Shared TerminalServerList As New List(Of String) - Public Shared Sub EnableDoubleBuffered(ByVal dgv As DataGridView) + Public Shared Sub EnableDoubleBuffered(ByRef dgv As DataGridView) Dim dgvType As Type = dgv.[GetType]() Dim pi As PropertyInfo = dgvType.GetProperty("DoubleBuffered", BindingFlags.Instance Or BindingFlags.NonPublic) diff --git a/Dokumentation/Classes/cDomUser.vb b/Dokumentation/Classes/cDomUser.vb index 45b52a0..49a3c73 100644 --- a/Dokumentation/Classes/cDomUser.vb +++ b/Dokumentation/Classes/cDomUser.vb @@ -49,7 +49,7 @@ Public Class cDomUser Public Function getDomUser(Filterspalte As String, Filterbegriff As String) Dim ds As New DataSet - cSQL.SQL2DS("select " & SelectItems & " from [Buchhaltung\sqlexpress].doku.dbo.tbl_domuser as Doku left join [Buchhaltung\sqlexpress].ADMIN.dbo.tblMitarbeiter on mit_AliasAD_Username = du_sAMAc where " & Filterspalte & "= '" & Filterbegriff & "'", ds) + cSQL.SQL2DS("select " & SelectItems & " from [SQLGuide01.verag.ost.dmn].doku.dbo.tbl_domuser as Doku left join [SQLGuide01.verag.ost.dmn].ADMIN.dbo.tblMitarbeiter on mit_AliasAD_Username = du_sAMAc where " & Filterspalte & "= '" & Filterbegriff & "'", ds) If ds.Tables(0).Rows.Count > 0 Then Exist = True @@ -67,7 +67,7 @@ Public Class cDomUser Public Function getDomUserByID(ID As String) Dim ds As New DataSet - cSQL.SQL2DS("select " & SelectItems & " from [Buchhaltung\sqlexpress].doku.dbo.tbl_domuser as Doku left join [Buchhaltung\sqlexpress].ADMIN.dbo.tblMitarbeiter on mit_AliasAD_Username = du_sAMAc WHERE du_ID = '" & ID & "'", ds) + cSQL.SQL2DS("select " & SelectItems & " from [SQLGuide01.verag.ost.dmn].doku.dbo.tbl_domuser as Doku left join [SQLGuide01.verag.ost.dmn].ADMIN.dbo.tblMitarbeiter on mit_AliasAD_Username = du_sAMAc WHERE du_ID = '" & ID & "'", ds) If ds.Tables(0).Rows.Count > 0 Then Exist = True diff --git a/Dokumentation/Main.vb b/Dokumentation/Main.vb index 6fa6c1e..8e1b6f8 100644 --- a/Dokumentation/Main.vb +++ b/Dokumentation/Main.vb @@ -642,19 +642,7 @@ Public Class Main End Function Private Sub CmdTest_Click(sender As Object, e As EventArgs) Handles CmdTest.Click - Dim frm As New frmLeer - frm.Text = "Benutzerverwaltung" - Dim usrcntrl As New uscntr_DomUser - - usrcntrl.Dock = DockStyle.Fill : frm.PanMain.Controls.Add(usrcntrl) - frm.Size = usrcntrl.Size - frm.Show() - - AddHandler frm.FormClosing, Function() - - End Function - - + CheckUpdate("DingDong") End Sub Private Sub CMdTest2_Click(sender As Object, e As EventArgs) Handles CMdTest2.Click Dim testuser As New cDomUser @@ -1109,7 +1097,7 @@ Public Class Main LblVersion.Text = "Version: " & Version Try Dim ds As New DataSet - cSQL.SQL2DS("SELECT prog_aktuelleVersion FROM ADMIN.dbo.tblProgramme WHERE prog_codename= '" & My.Resources.Programmcode & "'", ds) + cSQL.SQL2DS("SELECT prog_aktuelleVersion FROM " & Class1.DBAdmin & ".dbo.tblProgramme WHERE prog_codename= '" & My.Resources.Programmcode & "'", ds) If ds.Tables(0).Rows.Count Then RemoteVersion = ds.Tables(0).Rows(0).Item(0).ToString End If diff --git a/Dokumentation/My Project/Resources.Designer.vb b/Dokumentation/My Project/Resources.Designer.vb index 98f57ba..e9a5192 100644 --- a/Dokumentation/My Project/Resources.Designer.vb +++ b/Dokumentation/My Project/Resources.Designer.vb @@ -269,7 +269,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.1.57 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.1.60 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Dokumentation/My Project/Resources.resx b/Dokumentation/My Project/Resources.resx index 4bc80c4..42618f2 100644 --- a/Dokumentation/My Project/Resources.resx +++ b/Dokumentation/My Project/Resources.resx @@ -134,7 +134,7 @@ ..\Resources\Bearbeiten20.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - 0.0.1.57 + 0.0.1.60 ..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a