Index: vhUnitTest/APPS/VKP/LeveringsTermijnSFS/GetLeverDatums/Test.cls.xml
===================================================================
diff -u -r53052 -r53065
--- vhUnitTest/APPS/VKP/LeveringsTermijnSFS/GetLeverDatums/Test.cls.xml	(.../Test.cls.xml)	(revision 53052)
+++ vhUnitTest/APPS/VKP/LeveringsTermijnSFS/GetLeverDatums/Test.cls.xml	(.../Test.cls.xml)	(revision 53065)
@@ -17,9 +17,9 @@
 	
 	#dim LeverDatum As %Date = ##class(TECH.DateTime).TextToDate("01/01/2018")
 	
-	#dim LeverDatumsList As %ListOfDataTypes = LeveringsTermijnSFS.GetLeverDatums(LeverDatum,10)
+	#dim LeverDatumsList As %List = LeveringsTermijnSFS.GetLeverDatums(LeverDatum,10)
 	
-	If $$$AssertEquals(LeverDatumsList.Count(),0) {
+	If $$$AssertEquals($L(LeverDatumsList),0) {
 		Do SFSKalenderRepositoryMock.Verifieer()
 	}
 ]]></Implementation>
@@ -44,10 +44,10 @@
 	
 	#dim LeverDatum As %Date = ##class(TECH.DateTime).TextToDate("01/01/2018")
 	
-	#dim LeverDatumsList As %ListOfDataTypes = LeveringsTermijnSFS.GetLeverDatums(LeverDatum,10)
+	#dim LeverDatumsList As %List = LeveringsTermijnSFS.GetLeverDatums(LeverDatum,10)
 	
-	If $$$AssertEquals(LeverDatumsList.Count(),1) {
-		Do $$$AssertEquals(LeverDatumsList.GetAt(1),##class(TECH.DateTime).TextToDate("02/02/2018"))
+	If $$$AssertEquals($LL(LeverDatumsList),1) {
+		Do $$$AssertEquals($LG(LeverDatumsList,1),##class(TECH.DateTime).TextToDate("02/02/2018"))
 		Do SFSKalenderRepositoryMock.Verifieer()
 	}
 ]]></Implementation>
@@ -77,11 +77,11 @@
 	
 	#dim LeverDatum As %Date = ##class(TECH.DateTime).TextToDate("01/01/2018")
 	
-	#dim LeverDatumsList As %ListOfDataTypes = LeveringsTermijnSFS.GetLeverDatums(LeverDatum,10)
+	#dim LeverDatumsList As %List = LeveringsTermijnSFS.GetLeverDatums(LeverDatum,10)
 	
-	If $$$AssertEquals(LeverDatumsList.Count(),2) {
-		Do $$$AssertEquals(LeverDatumsList.GetAt(1),##class(TECH.DateTime).TextToDate("02/02/18"))
-		Do $$$AssertEquals(LeverDatumsList.GetAt(2),##class(TECH.DateTime).TextToDate("03/02/18"))
+	If $$$AssertEquals($LL(LeverDatumsList),2) {
+		Do $$$AssertEquals($LG(LeverDatumsList,1),##class(TECH.DateTime).TextToDate("02/02/18"))
+		Do $$$AssertEquals($LG(LeverDatumsList,2),##class(TECH.DateTime).TextToDate("03/02/18"))
 		Do SFSKalenderRepositoryMock.Verifieer()
 	}
 ]]></Implementation>
Index: APPS/VKP/LeveringsTermijnSFS.cls.xml
===================================================================
diff -u -r53052 -r53065
--- APPS/VKP/LeveringsTermijnSFS.cls.xml	(.../LeveringsTermijnSFS.cls.xml)	(revision 53052)
+++ APPS/VKP/LeveringsTermijnSFS.cls.xml	(.../LeveringsTermijnSFS.cls.xml)	(revision 53065)
@@ -31,22 +31,19 @@
 <FormalSpec>LeverDatum:%Date,AantalWeken:%Integer</FormalSpec>
 <ReturnType>%List</ReturnType>
 <Implementation><![CDATA[
-	#dim LeverDatums As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	#dim LeverDatums As %String = ""
 	
 	#dim PickupDate As %Date = LeverDatum
 	#dim UntilPickupDate As %Date = ##class(TECH.DateTime).DatumBereken(LeverDatum, AantalWeken, ..#Weken)
 	
 	#dim SFSKalenderListIterator As TECH.Iterator = ..SFSKalenderRepository.ZoekViaPickupDate(PickupDate, UntilPickupDate)
 	
-	;#dim SFSKalenderListIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(SFSKalenderList)
-	
 	While SFSKalenderListIterator.HasNext() {
 		#dim SFSKalender As APPS.EC.impl.LeverdatumBepaler.Data.SFSKalender = SFSKalenderListIterator.Next()
-		If $$$Not(LeverDatums.Find(SFSKalender.DeliveryDate)) {
-			Do LeverDatums.Insert(SFSKalender.DeliveryDate)	
+		If $$$Not($LF(LeverDatums,SFSKalender.DeliveryDate)) {
+			Set LeverDatums = LeverDatums _ $LB(SFSKalender.DeliveryDate)	
 		}
 	}
-	
 	Quit LeverDatums
 ]]></Implementation>
 </Method>