From 4360074d97a7fd2268f3940548636211630684ab Mon Sep 17 00:00:00 2001 From: ms Date: Thu, 18 Jun 2020 14:09:19 +0200 Subject: [PATCH] Neue SQL Server, Chatupdate verag-prog-allg --- Doku.sln | 2 +- Dokumentation/Classes/Class1.vb | 3 ++- Dokumentation/Dokumentation.vbproj | 23 ++++++++----------- Dokumentation/Main.vb | 4 +++- .../My Project/Resources.Designer.vb | 2 +- Dokumentation/My Project/Resources.resx | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Doku.sln b/Doku.sln index b08103e..fe51174 100644 --- a/Doku.sln +++ b/Doku.sln @@ -7,7 +7,7 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Dokumentation", "Dokumentat EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Dokumentation_Updater", "Dokumentation_Updater\Dokumentation_Updater.vbproj", "{5C2A947D-17F3-4975-8781-3B662FC72EAB}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAG_PROG_ALLGEMEIN", "..\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj", "{A3B497BD-842C-4A2B-B398-ED1976849DF1}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAG_PROG_ALLGEMEIN", "..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj", "{A3B497BD-842C-4A2B-B398-ED1976849DF1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Dokumentation/Classes/Class1.vb b/Dokumentation/Classes/Class1.vb index 6356cea..1a552dc 100644 --- a/Dokumentation/Classes/Class1.vb +++ b/Dokumentation/Classes/Class1.vb @@ -9,7 +9,8 @@ Public Class Class1 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=buchhaltung.verag.ost.dmn\SQLEXPRESS;Initial Catalog=Doku;User ID=sa;Password=BmWr501956;Connection Timeout=5;" + Public Shared DBDoku As String = "Server=SQLCluster.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" Public Shared FilePath As String ' = "\\192.168.0.90\f\EDV-Wartung\Dokumentation" diff --git a/Dokumentation/Dokumentation.vbproj b/Dokumentation/Dokumentation.vbproj index 3d6325a..f0f0660 100644 --- a/Dokumentation/Dokumentation.vbproj +++ b/Dokumentation/Dokumentation.vbproj @@ -131,13 +131,13 @@ ..\packages\Ghostscript.NET.1.2.1\lib\net40\Ghostscript.NET.dll - - - - - - - + + + + + + + ..\packages\iTextSharp.5.5.13.1\lib\itextsharp.dll @@ -180,6 +180,9 @@ + + ..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll + @@ -594,11 +597,5 @@ false - - - {a3b497bd-842c-4a2b-b398-ed1976849df1} - VERAG_PROG_ALLGEMEIN - - \ No newline at end of file diff --git a/Dokumentation/Main.vb b/Dokumentation/Main.vb index 4fdcc9e..6fa6c1e 100644 --- a/Dokumentation/Main.vb +++ b/Dokumentation/Main.vb @@ -675,7 +675,7 @@ Public Class Main End Sub Private Sub btnTest3_Click(sender As Object, e As EventArgs) Handles btnTest3.Click - Class1.CopyDirectory("\\\\datenarchiv.verag.ost.dmn\Datenarchiv\DOKUMENTE\CHAT_EMOJIS\", sAppPath & "\Test\") + End Sub Public Function GetDHCPClients(Netzwerk As String, DHCPServer As String, Fill As Boolean, ByRef ds As DataSet) @@ -1330,6 +1330,8 @@ Public Class Main Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles picAVISOMessenger.Click + VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + For Each openForm In Application.OpenForms() If TypeOf (openForm) Is VERAG_PROG_ALLGEMEIN.frmMessenger Then CType(openForm, VERAG_PROG_ALLGEMEIN.frmMessenger).WindowState = FormWindowState.Normal diff --git a/Dokumentation/My Project/Resources.Designer.vb b/Dokumentation/My Project/Resources.Designer.vb index fbf33d8..98f57ba 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.56 ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die 0.0.1.57 ähnelt. ''' Friend ReadOnly Property Version() As String Get diff --git a/Dokumentation/My Project/Resources.resx b/Dokumentation/My Project/Resources.resx index 7e277db..4bc80c4 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.56 + 0.0.1.57 ..\Resources\Link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a