Index: TAOR rework/TAOR rework/databases/Kantenband/KantenbandMapper.vb =================================================================== diff -u -r1513 -r1913 --- TAOR rework/TAOR rework/databases/Kantenband/KantenbandMapper.vb (.../KantenbandMapper.vb) (revision 1513) +++ TAOR rework/TAOR rework/databases/Kantenband/KantenbandMapper.vb (.../KantenbandMapper.vb) (revision 1913) @@ -1,7 +1,7 @@ Imports System.Data.SqlClient Module KantenbandMapper - Private SQLConnection As New SqlConnection With {.ConnectionString = "Server=SQLTAOR\M_GBE_0006; database=HALUX; user=VH_write; Pwd=SQLwr!t3"} + Private SQLConnection As New SqlConnection With {.ConnectionString = My.Settings.KantenbandConnectieString} Private command As SqlCommand Private Sub connectToKantenband() Index: TAOR rework/TAOR rework/databases/Ardis/ArdisMapper.vb =================================================================== diff -u -r1887 -r1913 --- TAOR rework/TAOR rework/databases/Ardis/ArdisMapper.vb (.../ArdisMapper.vb) (revision 1887) +++ TAOR rework/TAOR rework/databases/Ardis/ArdisMapper.vb (.../ArdisMapper.vb) (revision 1913) @@ -1,7 +1,7 @@ Imports System.Data.SqlClient Public Module ArdisMapper - Private ReadOnly SqlConnection As New SqlConnection With {.ConnectionString = "Server=Ardisserver\SQLEXPRESS; database=VH_Ardis_TST; user=VH_write; Pwd=SQLwr!t3"} + Private ReadOnly SqlConnection As New SqlConnection With {.ConnectionString = My.Settings.ArdisConnectieString} ''' ''' Hulpfunctie voor te connecteren met Ardis. Index: TAOR rework/TAOR rework/My Project/Settings.Designer.vb =================================================================== diff -u -r1892 -r1913 --- TAOR rework/TAOR rework/My Project/Settings.Designer.vb (.../Settings.Designer.vb) (revision 1892) +++ TAOR rework/TAOR rework/My Project/Settings.Designer.vb (.../Settings.Designer.vb) (revision 1913) @@ -101,6 +101,58 @@ Me("LogOpslaanStatus") = value End Set End Property + + _ + Public ReadOnly Property ArdisConnectieString() As String + Get + Return CType(Me("ArdisConnectieString"),String) + End Get + End Property + + _ + Public ReadOnly Property CachéConnectieString() As String + Get + Return CType(Me("CachéConnectieString"),String) + End Get + End Property + + _ + Public ReadOnly Property StemasConnectieString() As String + Get + Return CType(Me("StemasConnectieString"),String) + End Get + End Property + + _ + Public ReadOnly Property KantenbandConnectieString() As String + Get + Return CType(Me("KantenbandConnectieString"),String) + End Get + End Property + + _ + Public ReadOnly Property AutomillingConnectieString() As String + Get + Return CType(Me("AutomillingConnectieString"),String) + End Get + End Property End Class End Namespace Index: TAOR rework/TAOR rework/databases/Automilling/AutomillingMapper.vb =================================================================== diff -u -r1895 -r1913 --- TAOR rework/TAOR rework/databases/Automilling/AutomillingMapper.vb (.../AutomillingMapper.vb) (revision 1895) +++ TAOR rework/TAOR rework/databases/Automilling/AutomillingMapper.vb (.../AutomillingMapper.vb) (revision 1913) @@ -1,7 +1,7 @@ Imports System.Data.SqlClient Public Module AutomillingMapper - Public SQLConnection As New SqlConnection With {.ConnectionString = "Server=SQLTAOR\M_GBE_0004; database=Automilling; user=VH_write; Pwd=SQLwr!t3"} + Public SQLConnection As New SqlConnection With {.ConnectionString = My.Settings.AutomillingConnectieString} Public command As SqlCommand Private Sub connectToAutomilling() Index: TAOR rework/TAOR rework/My Project/Settings.settings =================================================================== diff -u -r1892 -r1913 --- TAOR rework/TAOR rework/My Project/Settings.settings (.../Settings.settings) (revision 1892) +++ TAOR rework/TAOR rework/My Project/Settings.settings (.../Settings.settings) (revision 1913) @@ -14,5 +14,41 @@ True + + <?xml version="1.0" encoding="utf-16"?> +<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <ConnectionString>Server=Ardisserver\SQLEXPRESS; database=VH_Ardis_TST; user=VH_write; Pwd=SQLwr!t3</ConnectionString> +</SerializableConnectionString> + Server=Ardisserver\SQLEXPRESS; database=VH_Ardis_TST; user=VH_write; Pwd=SQLwr!t3 + + + <?xml version="1.0" encoding="utf-16"?> +<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <ConnectionString>DSN=Cache01Admin1; DRIVER={InterSystems ODBC}; SERVER=CACHE01;DATABASE=ADMIN1;UID=_SYSTEM;PWD=SYS</ConnectionString> +</SerializableConnectionString> + DSN=Cache01Admin1; DRIVER={InterSystems ODBC}; SERVER=CACHE01;DATABASE=ADMIN1;UID=_SYSTEM;PWD=SYS + + + <?xml version="1.0" encoding="utf-16"?> +<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <ConnectionString>Server=SQLTAOR\M_GBE_0014; database=StemasC; user=TD; Pwd=$qlTD2015</ConnectionString> +</SerializableConnectionString> + Server=SQLTAOR\M_GBE_0014; database=StemasC; user=TD; Pwd=$qlTD2015 + + + <?xml version="1.0" encoding="utf-16"?> +<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <ConnectionString>Server=SQLTAOR\M_GBE_0006; database=HALUX; user=VH_write; Pwd=SQLwr!t3</ConnectionString> +</SerializableConnectionString> + Server=SQLTAOR\M_GBE_0006; database=HALUX; user=VH_write; Pwd=SQLwr!t3 + + + <?xml version="1.0" encoding="utf-16"?> +<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <ConnectionString>Server=SQLTAOR\M_GBE_0004; database=Automilling; user=VH_write; Pwd=SQLwr!t3</ConnectionString> + <ProviderName /> +</SerializableConnectionString> + Server=SQLTAOR\M_GBE_0004; database=Automilling; user=VH_write; Pwd=SQLwr!t3 + \ No newline at end of file Index: TAOR rework/TAOR rework/databases/StemasC/StemasCMapper.vb =================================================================== diff -u -r1879 -r1913 --- TAOR rework/TAOR rework/databases/StemasC/StemasCMapper.vb (.../StemasCMapper.vb) (revision 1879) +++ TAOR rework/TAOR rework/databases/StemasC/StemasCMapper.vb (.../StemasCMapper.vb) (revision 1913) @@ -1,7 +1,7 @@ Imports System.Data.SqlClient Module StemasCMapper - Public SQLConnection As New SqlConnection With {.ConnectionString = "Server=SQLTAOR\M_GBE_0014; database=StemasC; user=TD; Pwd=$qlTD2015"} + Public SQLConnection As New SqlConnection With {.ConnectionString = My.Settings.StemasConnectieString} Public command As SqlCommand Private Sub connectToStemas() @@ -87,7 +87,7 @@ End Function Public Sub Opslaan(stemasData As StemasData) - LogBestandTextMapper.writeToFile("Stemas C", "Opslaan van StemasData met barcode: " & stemasData.Barcode) + LogBestandTextMapper.WriteToFile("Stemas C", "Opslaan van StemasData met barcode: " & stemasData.Barcode) 'alles inserten Dim query As String = "Insert into [StemasC].[dbo].[Production] (Barcode, BasePanelLenght, BasePanelWidth, SliceWidth, ProfilingWidth, NbrOfSlices, Alignment, SliceType, ProgLeft1, ProgRight1, SliceWidth1, PrintBegin1, PrintEnd1, ProgLeft2, ProgRight2, SliceWidth2, PrintBegin2, PrintEnd2, ProgLeft3, ProgRight3, SliceWidth3, PrintBegin3, PrintEnd3, ProgLeft4, ProgRight4, SliceWidth4, PrintBegin4, PrintEnd4, ProgLeft5, ProgRight5, SliceWidth5, PrintBegin5, PrintEnd5, BatchID, Toelevering, Dossiercode) VALUES " @@ -139,7 +139,7 @@ connectToStemas() addCommand.ExecuteNonQuery() - LogBestandTextMapper.writeToFile("Stemas C", "Opslaan van StemasData met barcode: " & stemasData.Barcode, True) + LogBestandTextMapper.WriteToFile("Stemas C", "Opslaan van StemasData met barcode: " & stemasData.Barcode, True) Catch ex As Exception Throw New Exception("Er is een fout opgetreden bij het wegschrijven van StemasData naar de Stemas databank " + ex.Message) End Try @@ -166,7 +166,7 @@ 'End Function Public Function OphalenData(BarcodeID As String) As StemasData - LogBestandTextMapper.writeToFile("Stemas C", "Ophalen van stemasData met barcodeID: " & BarcodeID) + LogBestandTextMapper.WriteToFile("Stemas C", "Ophalen van stemasData met barcodeID: " & BarcodeID) Dim result As StemasData Dim lijstKolommen As String = "Barcode,BasePanelLenght,BasePanelWidth,SliceWidth,ProfilingWidth,NbrOfSlices,Alignment,SliceType,ProgLeft1,ProgRight1,SliceWidth1,PrintBegin1,PrintEnd1,ProgLeft2,ProgRight2,SliceWidth2,PrintBegin2,PrintEnd2,ProgLeft3,ProgRight3,SliceWidth3,PrintBegin3,PrintEnd3,ProgLeft4,ProgRight4,SliceWidth4,PrintBegin4,PrintEnd4,ProgLeft5,ProgRight5,SliceWidth5,PrintBegin5,PrintEnd5,BatchID,Toelevering,Dossiercode" @@ -175,7 +175,7 @@ Throw New Exception("Er is iets foutgelopen bij het ophalen van de StemasData met barcode: " & BarcodeID) End If - LogBestandTextMapper.writeToFile("Stemas C", "Ophalen van stemasData met barcodeID: " & BarcodeID, True) + LogBestandTextMapper.WriteToFile("Stemas C", "Ophalen van stemasData met barcodeID: " & BarcodeID, True) Return result End Function @@ -194,7 +194,7 @@ 'End Function Public Sub update(stemasdata As StemasData) - LogBestandTextMapper.writeToFile("Stemas C", "Updaten van zijkamerFreesProductieData met barcode: " & stemasdata.Barcode) + LogBestandTextMapper.WriteToFile("Stemas C", "Updaten van zijkamerFreesProductieData met barcode: " & stemasdata.Barcode) Dim query As String = "update [StemasC].[dbo].[Production] set BasePanelWidth = @BasePanelWidth, SliceWidth = @SliceWidth where Barcode like @Barcode" Try @@ -206,7 +206,7 @@ command.Parameters.Add("@Barcode", SqlDbType.VarChar).Value = "%" & stemasdata.Barcode & "%" command.ExecuteNonQuery() - LogBestandTextMapper.writeToFile("Stemas C", "Updaten van zijkamerFreesProductieData met barcode: " & stemasdata.Barcode, True) + LogBestandTextMapper.WriteToFile("Stemas C", "Updaten van zijkamerFreesProductieData met barcode: " & stemasdata.Barcode, True) Catch ex As Exception Throw New Exception("Er is een fout opgetreden bij het updaten van stemasData met barcode: " & stemasdata.Barcode & vbNewLine & ex.Message) End Try Index: TAOR rework/TAOR rework/databases/Cache/CacheMapper.vb =================================================================== diff -u -r1909 -r1913 --- TAOR rework/TAOR rework/databases/Cache/CacheMapper.vb (.../CacheMapper.vb) (revision 1909) +++ TAOR rework/TAOR rework/databases/Cache/CacheMapper.vb (.../CacheMapper.vb) (revision 1913) @@ -3,7 +3,6 @@ Imports System.Text Module CacheMapper - Private Const CONNECTIE_STRING As String = "DSN=Cache01Admin1; DRIVER={InterSystems ODBC}; SERVER=CACHE01;DATABASE=ADMIN1;UID=_SYSTEM;PWD=SYS" Private _sqlConnection As OdbcConnection #Region "Hulpfuncties" @@ -14,7 +13,7 @@ Try If _sqlConnection Is Nothing Then 'Connectie initialiseren. - _sqlConnection = New OdbcConnection(CONNECTIE_STRING) + _sqlConnection = New OdbcConnection(My.Settings.CachéConnectieString) End If 'Controleer of connectie status al open is. If Not _sqlConnection.State = ConnectionState.Open Then Index: TAOR rework/TAOR rework/TAOR rework.vbproj =================================================================== diff -u -r1910 -r1913 --- TAOR rework/TAOR rework/TAOR rework.vbproj (.../TAOR rework.vbproj) (revision 1910) +++ TAOR rework/TAOR rework/TAOR rework.vbproj (.../TAOR rework.vbproj) (revision 1913) @@ -29,8 +29,8 @@ TAOR rework Robin De Bock false - 3 - 6.1.5.%2a + 0 + 6.1.6.%2a false true true Index: TAOR rework/TAOR rework/app.config =================================================================== diff -u -r1892 -r1913 --- TAOR rework/TAOR rework/app.config (.../app.config) (revision 1892) +++ TAOR rework/TAOR rework/app.config (.../app.config) (revision 1913) @@ -5,6 +5,17 @@
+ + + + + + +