Index: APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar.cls.xml	(revision 0)
+++ APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar.cls.xml	(revision 34145)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.Offerte.impl.DHL.OfferteBerekenaar">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="TransportduurRepository">
+<Type>APPS.TRANSP.Offerte.impl.DHL.TransportduurRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>TransportduurRepository:APPS.TRANSP.Offerte.impl.DHL.TransportduurRepository</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..TransportduurRepository = $$$Inject(TransportduurRepository, ##class(APPS.TRANSP.Offerte.impl.DHL.TransportduurRepository).%New())
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Bereken">
+<FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim TransportDuur As APPS.TRANSP.Offerte.impl.DHL.Transportduur = ..TransportduurRepository.GeefViaLandEnPostCode(BerekenInput.LeverAdres.LandCode,BerekenInput.LeverAdres.Postcode) 
+	Quit ..MaakOfferteData(TransportDuur,BerekenInput.VroegsteAfhaalDatum)
+]]></Implementation>
+</Method>
+
+<Method name="MaakOfferteData">
+<FormalSpec>Transportduur:APPS.TRANSP.Offerte.impl.DHL.Transportduur,VroegsteAfhaalDatum:%Date</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
+<Implementation><![CDATA[
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+	#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
+	
+	///te converteren adhv opgegeven tabel id conversie naar vanhoecke interne ID.
+	///Set OfferteItem.Omschrijving = "DHL Freight"
+	///Set OfferteItem.Code = Transportduur.GeefID() 
+	///Set OfferteItem.CarbonNeutralPrijs = 0
+
+	#dim VroegsteAfhaalDag As TECH.enu.Day = ##class(TECH.DateUtils).DayNumber(VroegsteAfhaalDatum)
+	
+	Set OfferteItem.Duurtijd = Transportduur.DuurtijdPerWeekdagNr.GetAt(VroegsteAfhaalDag)
+	Set OfferteItem.LeverDatum = ##class(TECH.DateTime).DatumBereken(VroegsteAfhaalDatum, OfferteItem.Duurtijd, ##class(TECH.enu.DatePart).Dag())
+	Set OfferteItem.LeverDag = ..GeefLeverDagAfkorting(##class(TECH.DateUtils).DayNumber(OfferteItem.LeverDatum))
+	Set OfferteItem.LeverTijd = "12:00"
+	Set OfferteItem.OphaalDatum = VroegsteAfhaalDatum
+	
+	Do OfferteData.Items.Insert(OfferteItem)
+	Quit OfferteData
+]]></Implementation>
+</Method>
+
+<Method name="GeefLeverDagAfkorting">
+<FormalSpec>WeekDayNumber:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim WeekDay As list Of %String = $LB("Mon","Tue","Wed","Thu","Fri","Sat","Sun")
+	Quit $List(WeekDay,WeekDayNumber)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar/Test.cls.xml	(revision 34145)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.TRANSP.Offerte.impl.DHL.OfferteBerekenaar.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Bereken() geeft de juiste duurtijd weer.">
+<Implementation><![CDATA[
+	Set TransportduurRepositoryFake = ##class(vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepository).%New()
+	Set OfferteBerekenaar = ##class(APPS.TRANSP.Offerte.impl.DHL.OfferteBerekenaar).%New(TransportduurRepositoryFake)
+	
+	Do ..AssertOfferteDataResult(OfferteBerekenaar.Bereken(..GeefBerekenInput()))
+]]></Implementation>
+</Method>
+
+<Method name="AssertOfferteDataResult">
+<FormalSpec>OfferteDataResult:APPS.TRANSP.OfferteService.dto.OfferteData</FormalSpec>
+<Implementation><![CDATA[
+	Do $$$AssertEquals(OfferteDataResult.Items.Count(), 1)
+	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).LeverDag,"Mon")
+	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).Duurtijd,4)
+	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).LeverDatum,64040)
+	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).LeverTijd,"12:00")
+]]></Implementation>
+</Method>
+
+<Method name="GeefBerekenInput">
+<Private>1</Private>
+<ReturnType>APPS.TRANSP.OfferteService.dto.BerekenInput</ReturnType>
+<Implementation><![CDATA[
+	#dim BerekenInput As APPS.TRANSP.OfferteService.dto.BerekenInput = ##class(APPS.TRANSP.OfferteService.dto.BerekenInput).%New()
+	Set BerekenInput.VroegsteAfhaalDatum = 64036
+	Set BerekenInput.LeverAdres = ##class(APPS.TRANSP.dto.InternationaalAdres).%New()
+	Set BerekenInput.LeverAdres.LandCode = "DE"
+	Set BerekenInput.LeverAdres.Postcode = "54122"
+	Quit BerekenInput
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/impl/OfferteService.cls.xml
===================================================================
diff -u -r34016 -r34145
--- APPS/TRANSP/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 34016)
+++ APPS/TRANSP/impl/OfferteService.cls.xml	(.../OfferteService.cls.xml)	(revision 34145)
@@ -7,12 +7,16 @@
 <FormalSpec>TransportFirma:APPS.TRANSP.enu.TransportFirma,BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput=""</FormalSpec>
 <ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
 <Implementation><![CDATA[
+	/// Deze code herbekijken....
 	If TransportFirma = ##class(APPS.TRANSP.enu.TransportFirma).UPS() {
 		if BerekenInput '= "" {
-			#dim OfferteBerekenaar As APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaar = ##class(APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaar).%New()
-			Quit OfferteBerekenaar.Bereken(BerekenInput)
+			Quit ##class(APPS.TRANSP.Offerte.impl.UPS.OfferteBerekenaar).%New().Bereken(BerekenInput)
 		}
-	} else {
+	} ElseIf TransportFirma = ##class(APPS.TRANSP.enu.TransportFirma).DHL() {
+		if BerekenInput '= "" {
+			Quit ##class(APPS.TRANSP.Offerte.impl.DHL.OfferteBerekenaar).%New().Bereken(BerekenInput)
+		}
+	} Else {
 		Do ##class(TECH.Exceptions.GeneralErrorException).Throw("Er is een onbestaande transportfirma meegegeven : " _TransportFirma)
 	}
 ]]></Implementation>
Index: vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/TransportduurRepository.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/TransportduurRepository.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/TRANSP/Offerte/impl/DHL/TransportduurRepository.cls.xml	(revision 34145)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.TRANSP.Offerte.impl.DHL.TransportduurRepository">
+<Super>APPS.TRANSP.Offerte.impl.DHL.TransportduurRepository</Super>
+
+<Method name="GeefViaLandEnPostCode">
+<FormalSpec>LandCode:%String,Postcode:%String</FormalSpec>
+<ReturnType>APPS.TRANSP.Offerte.impl.DHL.Transportduur</ReturnType>
+<Implementation><![CDATA[
+	#dim TransportDuur As APPS.TRANSP.Offerte.impl.DHL.Transportduur = ##class(APPS.TRANSP.Offerte.impl.DHL.Transportduur).%New()
+
+	Do TransportDuur.DuurtijdPerWeekdagNr.SetAt(4,##class(TECH.enu.Day).Maandag())
+	Do TransportDuur.DuurtijdPerWeekdagNr.SetAt(3,##class(TECH.enu.Day).Dinsdag())
+	Do TransportDuur.DuurtijdPerWeekdagNr.SetAt(2,##class(TECH.enu.Day).Woensdag())
+	Do TransportDuur.DuurtijdPerWeekdagNr.SetAt(4,##class(TECH.enu.Day).Donderdag())
+	Do TransportDuur.DuurtijdPerWeekdagNr.SetAt(3,##class(TECH.enu.Day).Vrijdag())
+	Do TransportDuur.DuurtijdPerWeekdagNr.SetAt(3,##class(TECH.enu.Day).Zaterdag())
+	Do TransportDuur.DuurtijdPerWeekdagNr.SetAt(3,##class(TECH.enu.Day).Zondag())
+	
+	Quit TransportDuur
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/TRANSP/OfferteService/Test.cls.xml
===================================================================
diff -u -r33074 -r34145
--- vhUnitTest/APPS/TRANSP/OfferteService/Test.cls.xml	(.../Test.cls.xml)	(revision 33074)
+++ vhUnitTest/APPS/TRANSP/OfferteService/Test.cls.xml	(.../Test.cls.xml)	(revision 34145)
@@ -21,6 +21,14 @@
 	Do OfferteService.BerekenOfferte(##class(APPS.TRANSP.enu.TransportFirma).UPS())
 ]]></Implementation>
 </Method>
+
+<Method name="Test: BerekenOfferte met Geldige TransportFirma DHL.">
+<Implementation><![CDATA[
+	#dim OfferteService As APPS.TRANSP.impl.OfferteService = ##class(APPS.TRANSP.impl.OfferteService).%New()
+	
+	Do OfferteService.BerekenOfferte(##class(APPS.TRANSP.enu.TransportFirma).DHL())
+]]></Implementation>
+</Method>
 </Class>