Index: vhUnitTest/Res/VertalingRepository/Test.cls.xml
===================================================================
diff -u -r60854 -r61828
--- vhUnitTest/Res/VertalingRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 60854)
+++ vhUnitTest/Res/VertalingRepository/Test.cls.xml	(.../Test.cls.xml)	(revision 61828)
@@ -37,6 +37,44 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: GeefAlleVertalingenVoorPerfion gebruikt de juiste query en parameters">
+<Implementation><![CDATA[
+	#dim Filter As %String = "Groep = ? OR Groep = ?"
+	#dim TableName As %String = "Res.Vertaling"
+	#dim Statement As %String = "SELECT ID FROM " _TableName _" WHERE " _Filter
+	#dim Parameters As %List = $ListBuild("ALG", "TT")
+	Set DynamicQuery = ##class(TECH.DynamicQuery).%New(Statement,Parameters)
+	#dim QueryAPIMock As vhTest.Mock.TECH.Query.QueryAPI = ##class(vhTest.Mock.TECH.Query.QueryAPI).%New("")
+	Do QueryAPIMock.VerwachtMethodCall("GetResultSet",..Matches.Object((DynamicQuery))).DanReturn($$$True)
+	Set VertalingRepository = ##class(Res.VertalingRepository).%New(,QueryAPIMock)
+	
+	Do VertalingRepository.GeefAlleVertalingenVoorPerfion()
+	
+	Do QueryAPIMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="aTest: VerwijderVertalingViaSleutel gebruikt de juiste query en parameters">
+<Implementation><![CDATA[
+	#dim Sleutel As %String = "DummySleutel"
+	#dim Filter As %String = "Intern = ?"
+	#dim TableName As %String = "Res.Vertaling"
+	#dim Statement As %String = "SELECT ID FROM " _TableName _" WHERE " _Filter
+	#dim Parameters As %List = $ListBuild(Sleutel)
+	Set DynamicQuery = ##class(TECH.DynamicQuery).%New(Statement,Parameters)
+	
+	#dim QueryAPIMock As vhTest.Mock.TECH.Query.QueryAPI = ##class(vhTest.Mock.TECH.Query.QueryAPI).%New("")
+	Do QueryAPIMock.VerwachtMethodCall("GetResultSet",..Matches.Object((DynamicQuery))).DanReturn($$$True)
+	#dim GatewayMock As vhTest.Mock.TECH.Persistent.impl.Gateway = ##class(vhTest.Mock.TECH.Persistent.impl.Gateway).%New("")
+	Do GatewayMock.VerwachtMethodCall("DeleteId","DummyID").DanReturn($$$True)
+	Set VertalingRepository = ##class(Res.VertalingRepository).%New(GatewayMock,QueryAPIMock)
+	
+	Do VertalingRepository.VerwijderVertalingViaSleutel(Sleutel)
+	
+	Do QueryAPIMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test: VerwijderVertaling gebruikt de juiste query en parameters">
 <Implementation><![CDATA[
 	#dim Groep As %String = "RandomGroep"
Index: Res/VertalingRepository.cls.xml
===================================================================
diff -u -r60854 -r61828
--- Res/VertalingRepository.cls.xml	(.../VertalingRepository.cls.xml)	(revision 60854)
+++ Res/VertalingRepository.cls.xml	(.../VertalingRepository.cls.xml)	(revision 61828)
@@ -15,39 +15,25 @@
 ]]></Implementation>
 </Method>
 
-<UDLText name="T">
-<Content><![CDATA[
-/*Method MaakVertaling(Groep As %String, Sleutel As %String, Type As %String, Taal As %String, Vertaling As %String) As TECH.Persistent
-{
-	Set VertalingObject = ##class(Res.Vertaling).%New()
-	Set VertalingObject.Groep = Groep
-	Set VertalingObject.Intern = Sleutel
-	Set VertalingObject.Type = Type
-	Set VertalingObject.Vertaling = Vertaling
-	Do ..Bewaar(VertalingObject)
-	Quit VertalingObject
-	test
-}
-test 
-*/
-]]></Content>
-</UDLText>
-
 <Method name="GeefVertaling">
 <FormalSpec>Groep:%String,Sleutel:%String,Type:%String,Taal:%String</FormalSpec>
 <ReturnType>Res.Vertaling</ReturnType>
 <Implementation><![CDATA[	 Quit ..GeefViaID(Groep_"||"_Sleutel_"||"_Type_"||"_Taal)
 ]]></Implementation>
 </Method>
 
+<Method name="GeefAlleVertalingenVoorPerfion">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	 Quit ..ZoekViaFilter("Groep = ? OR Groep = ?", $ListBuild("ALG", "TT"))
+]]></Implementation>
+</Method>
+
 <Method name="UpdateVertalingIndienBestaat">
 <FormalSpec>Groep:%String,Sleutel:%String,Type:%String,Taal:%String,Vertaling:%String</FormalSpec>
 <ReturnType>TECH.Persistent</ReturnType>
 <Implementation><![CDATA[
 	#dim VertalingObject As Res.Vertaling 
-	Do ##class(Tools.Wlip).%New(26).String(Groep_Sleutel_Type_Taal)
 	Set VertalingObject = ..GeefVertaling(Groep, Sleutel, Type, Taal)
-	Do ##class(Tools.Wlip).%New(26).ObjToText(VertalingObject)
 	Set VertalingObject.Vertaling = Vertaling
 	Do ..Bewaar(VertalingObject) 
 
@@ -84,6 +70,12 @@
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="VerwijderVertalingViaSleutel">
+<FormalSpec>Sleutel:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..VerwijderViaFilter("Intern = ?", $ListBuild(Sleutel))
+]]></Implementation>
+</Method>
 </Class>