Index: TAOR-rework-bugfixing/TAOR rework/nieuwdomein/mappers/SifonLadenMapper.vb =================================================================== diff -u -r1639 -r1645 --- TAOR-rework-bugfixing/TAOR rework/nieuwdomein/mappers/SifonLadenMapper.vb (.../SifonLadenMapper.vb) (revision 1639) +++ TAOR-rework-bugfixing/TAOR rework/nieuwdomein/mappers/SifonLadenMapper.vb (.../SifonLadenMapper.vb) (revision 1645) @@ -22,15 +22,38 @@ 'Aantal laden opvragen en loop starten. Dim aantalLaden = SpecialLadeMapperUtil.GeefAantalLaden(onderdelen, onderdelenAantalDictionary) - For i = 0 To aantalLaden -1 + For i = 0 To aantalLaden - 1 + 'Onderdelen ophalen. + Dim zijkantL = SpecialLadeMapperUtil.GeefOnderdelenUitLade(Of Zijkant)(i, onderdelen, onderdelenAantalDictionary)(0) + Dim zijkantR = SpecialLadeMapperUtil.GeefOnderdelenUitLade(Of Zijkant)(i, onderdelen, onderdelenAantalDictionary)(1) + Dim bodem = SpecialLadeMapperUtil.GeefOnderdeelUitLade(Of Bodem)(i, onderdelen) + Dim rug = SpecialLadeMapperUtil.GeefOnderdeelUitLade(Of Rug)(i, onderdelen) + 'Optioneel front. + Dim front = SpecialLadeMapperUtil.GeefOnderdeelUitLade(Of Front)(i, onderdelen) + + 'Initialisatie sifonlade. + Dim sifonLade As ISifonLade + 'Nieuwe sifonlade initialiseren met informatie. - Dim sifonLade As New SifonLadeV2( _ - SpecialLadeMapperUtil.GeefOnderdelenUitLade(Of Zijkant)(i, onderdelen, onderdelenAantalDictionary)(0), _ - SpecialLadeMapperUtil.GeefOnderdelenUitLade(Of Zijkant)(i, onderdelen, onderdelenAantalDictionary)(1), _ - SpecialLadeMapperUtil.GeefOnderdeelUitLade(Of Front)(i, onderdelen), _ - SpecialLadeMapperUtil.GeefOnderdeelUitLade(Of Bodem)(i, onderdelen), _ - SpecialLadeMapperUtil.GeefOnderdeelUitLade(Of Rug)(i, onderdelen) _ - ) + If front Is Nothing Then + 'Optioneel front is niet aanwezig. + sifonLade = New SifonLadeV2( + zijkantL, + zijkantR, + bodem, + rug + ) + Else + 'Front is aanwezig. + sifonLade = New SifonLadeV2Compleet( + zijkantL, + zijkantR, + bodem, + rug, + front + ) + End If + 'Toevoegen aan lijst. sifonLaden.Add(sifonLade) Next Index: TAOR-rework-bugfixing/TAOR rework/laden/special laden/Sifonladen/SifonLadeV2.vb =================================================================== diff -u -r1644 -r1645 --- TAOR-rework-bugfixing/TAOR rework/laden/special laden/Sifonladen/SifonLadeV2.vb (.../SifonLadeV2.vb) (revision 1644) +++ TAOR-rework-bugfixing/TAOR rework/laden/special laden/Sifonladen/SifonLadeV2.vb (.../SifonLadeV2.vb) (revision 1645) @@ -1,23 +1,21 @@ Imports TA_OR_rework Public Class SifonLadeV2 - Implements ISifonLade + Implements ISifonLade, ISifonLadeVerplichteOnderdelen 'Properties Public Property Bestandsnaam As String Implements ISifonLade.Bestandsnaam Public Property Batch As String Implements ISifonLade.Batch #Region "Onderdelen" - Public Property BuitenzijkantL As Zijkant Implements ISifonLade.BuitenzijkantL - Public Property BuitenzijkantR As Zijkant Implements ISifonLade.BuitenzijkantR - Public Property BinnenzijkantL1 As Zijkant Implements ISifonLade.BinnenzijkantL1 - Public Property BinnenzijkantR1 As Zijkant Implements ISifonLade.BinnenzijkantR1 - Public Property Front As Front Implements ISifonLade.Front - Public Property Bodem As Bodem Implements ISifonLade.Bodem - Public Property OrigineleRug As Rug Implements ISifonLade.OrigineleRug - Public Property RugL As Rug Implements ISifonLade.RugL - Public Property RugR As Rug Implements ISifonLade.RugR - + Public Property BuitenzijkantL As Zijkant Implements ISifonLadeVerplichteOnderdelen.BuitenzijkantL + Public Property BuitenzijkantR As Zijkant Implements ISifonLadeVerplichteOnderdelen.BuitenzijkantR + Public Property BinnenzijkantL1 As Zijkant Implements ISifonLadeVerplichteOnderdelen.BinnenzijkantL1 + Public Property BinnenzijkantR1 As Zijkant Implements ISifonLadeVerplichteOnderdelen.BinnenzijkantR1 + Public Property Bodem As Bodem Implements ISifonLadeVerplichteOnderdelen.Bodem + Public Property OrigineleRug As Rug Implements ISifonLadeVerplichteOnderdelen.OrigineleRug + Public Property RugL As Rug Implements ISifonLadeVerplichteOnderdelen.RugL + Public Property RugR As Rug Implements ISifonLadeVerplichteOnderdelen.RugR #End Region #Region "Afmetingen" @@ -28,7 +26,7 @@ Public ReadOnly Property PositieSifonuitsparingR As Double Implements ISifonLade.PositieSifonuitsparingR Get - Return KastBreedte - PositieSifonuitsparingL - BreedteSifonuitsparing + Return (KastBreedte - 31) - PositieSifonuitsparingL - BreedteSifonuitsparing End Get End Property @@ -39,10 +37,9 @@ Public Sub New() End Sub - Public Sub New(buitenzijkantL As Zijkant, buitenzijkantR As Zijkant, front As Front, bodem As Bodem, rug As Rug) + Public Sub New(buitenzijkantL As Zijkant, buitenzijkantR As Zijkant, bodem As Bodem, rug As Rug) Me.BuitenzijkantL = buitenzijkantL Me.BuitenzijkantR = buitenzijkantR - Me.Front = front Me.Bodem = bodem Me.OrigineleRug = rug 'Variabelen instellen. @@ -54,15 +51,25 @@ End Sub ''' - Private Function GeefOrigineleOnderdelen() As IEnumerable(Of IOnderdeel) Implements ISpecialLade.GeefOrigineleOnderdelen + public overridable Function GeefOrigineleOnderdelen() As IEnumerable(Of IOnderdeel) Implements ISpecialLade.GeefOrigineleOnderdelen 'Lijst initialiseren met onderdelen en retourneren. Return New List(Of IOnderdeel) From { BuitenzijkantL, BuitenzijkantR, - Front, Bodem, OrigineleRug } End Function + ''' + ''' Waarden aanpassen van bepaalde velden. + ''' + 'Public Overrides Sub updateData() + ' 'de kleuren updaten (extra ruggen en zijkanten worden gegenereerd aan de hand van de originele) + ' For Each zijkant As ArdisData In _zijkanten + ' zijkant.pasKleurAanSpecial() + ' Next + ' _bodem.pasKleurAanSpecial() + ' _origineleRug.pasKleurAanSpecial() + 'End Sub End Class Index: TAOR-rework-bugfixing/TAOR rework/laden/special laden/Sifonladen/ISifonLadeVerplichteOnderdelen.vb =================================================================== diff -u --- TAOR-rework-bugfixing/TAOR rework/laden/special laden/Sifonladen/ISifonLadeVerplichteOnderdelen.vb (revision 0) +++ TAOR-rework-bugfixing/TAOR rework/laden/special laden/Sifonladen/ISifonLadeVerplichteOnderdelen.vb (revision 1645) @@ -0,0 +1,14 @@ +''' +''' Onderdelen die in geen enkele sifonlade Nothing mogen zijn, aka overal verplicht. +''' +Public Interface ISifonLadeVerplichteOnderdelen + Property BuitenzijkantL As Zijkant + Property BuitenzijkantR As Zijkant + Property BinnenzijkantL1 As Zijkant + Property BinnenzijkantR1 As Zijkant + 'Front is niet verplicht. + Property Bodem As Bodem + Property OrigineleRug As Rug + Property RugL As Rug + Property RugR As Rug +End Interface \ No newline at end of file Index: TAOR-rework-bugfixing/TAOR rework/laden/special laden/Sifonladen/ISifonLadeAlleOnderdelen.vb =================================================================== diff -u --- TAOR-rework-bugfixing/TAOR rework/laden/special laden/Sifonladen/ISifonLadeAlleOnderdelen.vb (revision 0) +++ TAOR-rework-bugfixing/TAOR rework/laden/special laden/Sifonladen/ISifonLadeAlleOnderdelen.vb (revision 1645) @@ -0,0 +1,8 @@ +''' +''' 'Alle onderdelen die optioneel zijn in de worden hier toegevoegd als verplicht./> +''' +Public Interface ISifonLadeAlleOnderdelen + Inherits ISifonLadeVerplichteOnderdelen + 'Front was niet verplicht. + property Front As Front +End Interface Index: TAOR-rework-bugfixing/TAOR rework/TAOR rework.vbproj =================================================================== diff -u -r1642 -r1645 --- TAOR-rework-bugfixing/TAOR rework/TAOR rework.vbproj (.../TAOR rework.vbproj) (revision 1642) +++ TAOR-rework-bugfixing/TAOR rework/TAOR rework.vbproj (.../TAOR rework.vbproj) (revision 1645) @@ -163,6 +163,9 @@ + + + Index: TAOR-rework-bugfixing/TAOR rework/laden/special laden/Sifonladen/ISifonLade.vb =================================================================== diff -u -r1642 -r1645 --- TAOR-rework-bugfixing/TAOR rework/laden/special laden/Sifonladen/ISifonLade.vb (.../ISifonLade.vb) (revision 1642) +++ TAOR-rework-bugfixing/TAOR rework/laden/special laden/Sifonladen/ISifonLade.vb (.../ISifonLade.vb) (revision 1645) @@ -4,17 +4,6 @@ Property Bestandsnaam As String Property Batch As String - 'Onderdelen - Property BuitenzijkantL As Zijkant - Property BuitenzijkantR As Zijkant - Property BinnenzijkantL1 As Zijkant - Property BinnenzijkantR1 As Zijkant - property Front As Front - Property Bodem As Bodem - Property OrigineleRug As Rug - Property RugL As Rug - Property RugR As Rug - 'Afmetingen Property KastBreedte As Double Property LadeDiepte As Double Index: TAOR-rework-bugfixing/TAOR rework/laden/special laden/Sifonladen/SifonLadeV2Compleet.vb =================================================================== diff -u --- TAOR-rework-bugfixing/TAOR rework/laden/special laden/Sifonladen/SifonLadeV2Compleet.vb (revision 0) +++ TAOR-rework-bugfixing/TAOR rework/laden/special laden/Sifonladen/SifonLadeV2Compleet.vb (revision 1645) @@ -0,0 +1,27 @@ +Public Class SifonLadeV2Compleet + Inherits SifonLadeV2 + Implements ISifonLadeAlleOnderdelen + +#Region "Onderdelen" + Public Property Front As Front Implements ISifonLadeAlleOnderdelen.Front +#End Region + + Public Sub New(buitenzijkantL As Zijkant, buitenzijkantR As Zijkant, bodem As Bodem, rug As Rug, front As Front) + 'Constructur SifonLade aanroepen met alle verplichte velden. + MyBase.New(buitenzijkantL, buitenzijkantR, bodem, rug) + 'Nieuw verplicht veld toewijzen. + Me.Front = front + End Sub + + ''' + Public Overrides Function GeefOrigineleOnderdelen() As IEnumerable(Of IOnderdeel) + 'Lijst initialiseren met onderdelen en retourneren. + Return New List(Of IOnderdeel) From { + BuitenzijkantL, + BuitenzijkantR, + Bodem, + OrigineleRug, + Front + } + End Function +End Class