Index: TAOR rework/TAOR rework/Configuraties/Configs.vb =================================================================== diff -u -r1886 -r2072 --- TAOR rework/TAOR rework/Configuraties/Configs.vb (.../Configs.vb) (revision 1886) +++ TAOR rework/TAOR rework/Configuraties/Configs.vb (.../Configs.vb) (revision 2072) @@ -4,6 +4,7 @@ Public Module Configs Private _algemeneConfigs As List(Of String) + Private _oorsprongIdAliassen As Dictionary(Of String, String) Private _specialsConfigs As List(Of String) Private _sifonLadeWaarden As List(Of String) Private _voorraadWaarden As List(Of String) @@ -14,6 +15,7 @@ If Directory.Exists(My.Settings.PathNaarConfigMap) Then Try _algemeneConfigs = ConfigsTextMapper.getAllValues + _oorsprongIdAliassen = New Dictionary(Of String, String) _specialsConfigs = WaardenSpecialsTextMapper.getAllValues _sifonLadeWaarden = WaardenSifonLadeTextMapper.getAllValues _voorraadWaarden = WaardenVoorraadTextMapper.getAllValues @@ -28,6 +30,9 @@ laadHelpPDFPath() laadOnderdelenKleuren() + 'oorsprong ID + LaadOorsprongIdAliassen() + 'specials algemene waarden laadArdisSpecialPath() laadStemasProgsLeft1Stemas() @@ -352,6 +357,30 @@ #End Region +#Region "Computer identifier & Oorsprong Id alias" + + Public Function GetComputerIdentifier() As String + Return Environ("computername") + End Function + + 'OorsprongID + Private Sub LaadOorsprongIdAliassen() + Try + for each item in New OorsprongIdAliasMapperXML(New XmlMapper).GetData(Of List(of String()))() + _oorsprongIdAliassen.Add(item(0),item(1)) + Next + Catch ex As Exception + Throw New Exception($"Kon oorsprong aliassen niet ophalen{vbNewLine}{ex.Message}") + End Try + End Sub + + Public Function GeefOorsprongIdAlias() As String + Return If(_oorsprongIdAliassen.ContainsKey(GetComputerIdentifier()), _oorsprongIdAliassen.Item(GetComputerIdentifier()), GetComputerIdentifier()) + End Function + +#End Region + + #Region "specials configs" #Region "path naar ardis special" @@ -632,11 +661,11 @@ #End Region - Private _sifonLadePartExt09ZijkantLinks as String - Private _sifonLadePartExt09ZijkantRechts as String - Private _sifonLadePartExt09Rug as String + Private _sifonLadePartExt09ZijkantLinks As String + Private _sifonLadePartExt09ZijkantRechts As String + Private _sifonLadePartExt09Rug As String #Region "PartExt09 waarde voor gegenereerde onderderdelen" - private sub laadSifonWaardenEtiketlijnGegenereerdeOnderdelen() + Private Sub laadSifonWaardenEtiketlijnGegenereerdeOnderdelen() 'ZIJKANT LINKS For teller = 0 To _sifonLadeWaarden.Count - 1 Dim lijn As String = _sifonLadeWaarden(teller) @@ -679,7 +708,7 @@ If _sifonLadePartExt09Rug Is Nothing OrElse _sifonLadeVerplaatsFolderPath.Equals("") Then Throw New Exception("TICKETLIJNGEGENEREERDERUG is niet geconfigureerd in het SifonLadeWaarden bestand.") End If - End sub + End Sub Public Function sifonLadeGeefPartExt09GegenereerdeZijkantLinks() As String Return _sifonLadePartExt09ZijkantLinks Index: TAOR rework/TAOR rework/Configuraties/OorsprongIdAliasMapperXML.vb =================================================================== diff -u --- TAOR rework/TAOR rework/Configuraties/OorsprongIdAliasMapperXML.vb (revision 0) +++ TAOR rework/TAOR rework/Configuraties/OorsprongIdAliasMapperXML.vb (revision 2072) @@ -0,0 +1,25 @@ +Imports System.IO + +Public Class OorsprongIdAliasMapperXML + Implements IMapper + + Private ReadOnly _xmlMapper As IXmlMapper + + Sub New(xmlMapper As IXmlMapper) + _xmlMapper = xmlMapper + End Sub + + Public Sub WriteData (Of T)(item As T) Implements IMapper.WriteData + _xmlMapper.WriteData(New FileStream(GetPath(), FileMode.Create), item) + End Sub + + Public Function GetData (Of T)() As T Implements IMapper.GetData + return _xmlMapper.GetData(of T)(New FileStream(GetPath(), FileMode.Open, FileAccess.Read, FileShare.Read)) + End Function + + Private Shared Function GetPath() As String + Dim fullPath = Path.Combine(My.Settings.PathNaarConfigMap, "OorsprongIdAliassen.xml") + Return fullPath + End Function + +End Class