Index: APPS/TRANSP/impl/TransportService.cls.xml
===================================================================
diff -u -r52401 -r52404
--- APPS/TRANSP/impl/TransportService.cls.xml	(.../TransportService.cls.xml)	(revision 52401)
+++ APPS/TRANSP/impl/TransportService.cls.xml	(.../TransportService.cls.xml)	(revision 52404)
@@ -23,8 +23,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="RapportDataFactory">
+<Type>APPS.TRANSP.impl.TransportService.RapportDataFactory</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>EmailVoorBevestigingBepaler:APPS.TRANSP.impl.TransportService.EmailVoorBevestigingBepaler="",VerpakkingEenheidFactory:APPS.TRANSP.impl.VerpakkingEenheidFactory,TransportdataVoorKlantBepaler:APPS.TRANSP.impl.TransportService.TransportdataVoorKlantBepaler="",RapportGenerator:APPS.common.Rapport.impl.BestandGeneratorDataTransferObjectBased=""</FormalSpec>
+<FormalSpec>EmailVoorBevestigingBepaler:APPS.TRANSP.impl.TransportService.EmailVoorBevestigingBepaler="",VerpakkingEenheidFactory:APPS.TRANSP.impl.VerpakkingEenheidFactory,TransportdataVoorKlantBepaler:APPS.TRANSP.impl.TransportService.TransportdataVoorKlantBepaler="",RapportGenerator:APPS.common.Rapport.impl.BestandGeneratorDataTransferObjectBased="",RapportDataFactory:APPS.TRANSP.impl.TransportService.RapportDataFactory=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -34,6 +39,7 @@
 	Set ..VerpakkingEenheidFactory = $$$Inject(VerpakkingEenheidFactory, ##class(APPS.TRANSP.impl.VerpakkingEenheidFactory).%New())
 	Set ..TransportdataVoorKlantBepaler = $$$Inject(TransportdataVoorKlantBepaler, ##class(APPS.TRANSP.impl.TransportService.TransportdataVoorKlantBepaler).%New())
 	Set ..RapportGenerator = $$$Inject(RapportGenerator, ##class(APPS.common.Rapport.impl.BestandGeneratorDataTransferObjectBased).%New())
+	Set ..RapportDataFactory = $$$Inject(RapportDataFactory, ##class(APPS.TRANSP.impl.TransportService.RapportDataFactory).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -250,47 +256,12 @@
 	Set RitDataLijst = ..TransportdataVoorKlantBepaler.BepaalTransportData(KlantId, BeginDatum, EindDatum)
 	
 	//csv maken
-	#dim RapportData As APPS.common.Rapport.dto.BestandRapportDataDataTransferObjectBased = ##class(APPS.common.Rapport.dto.BestandRapportDataDataTransferObjectBased).%New()
+	Do ..RapportGenerator.MaakBestand(..RapportDataFactory.MaakRapportData(RitDataLijst))
 	
-	Set RapportData.DataVelden = ..GeefDataVelden()
-	Set RapportData.DataTransferObjecten = RitDataLijst
-	Set RapportData.BestandVolledigeNaam = "c:\tom.csv"
-	
-	Do ..RapportGenerator.MaakBestand(RapportData)
-	
 	//mailen
 	//csv verwijderen
 ]]></Implementation>
 </Method>
-
-<Method name="GeefDataVelden">
-<Private>1</Private>
-<ReturnType>TECH.KeyValue.List</ReturnType>
-<Implementation><![CDATA[
-	#dim KeyValueList As TECH.KeyValue.List = ##class(TECH.KeyValue.List).%New()
-	
-	Do ..VoegToeEigenschap(KeyValueList, "RitNummer")
-	Do ..VoegToeEigenschap(KeyValueList, "OphaalTijdstip")
-	Do ..VoegToeEigenschap(KeyValueList, "AantalEuroPallet")
-	Do ..VoegToeEigenschap(KeyValueList, "AantalHalveEuroPallet")
-	Do ..VoegToeEigenschap(KeyValueList, "LeveradresNaam")
-	Do ..VoegToeEigenschap(KeyValueList, "LeveradresStraat")
-	Do ..VoegToeEigenschap(KeyValueList, "LeveradresPostcode")
-	Do ..VoegToeEigenschap(KeyValueList, "LeveradresGemeente")
-	
-	Quit KeyValueList
-]]></Implementation>
-</Method>
-
-<Method name="VoegToeEigenschap">
-<FormalSpec>KeyValueList:TECH.KeyValue.List,Eigenschap:%String</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim DataClassName As %String = ##class(APPS.TRANSP.dto.Nacalculatie).%ClassName(1)
-	
-	Do KeyValueList.InsertKeyValue(DataClassName, Eigenschap)
-]]></Implementation>
-</Method>
 </Class>