Index: vhUnitTest/DOM/PM/Maatwerk/HF/TestHalffabRepository.cls.xml
===================================================================
diff -u -r29059 -r31593
--- vhUnitTest/DOM/PM/Maatwerk/HF/TestHalffabRepository.cls.xml	(.../TestHalffabRepository.cls.xml)	(revision 29059)
+++ vhUnitTest/DOM/PM/Maatwerk/HF/TestHalffabRepository.cls.xml	(.../TestHalffabRepository.cls.xml)	(revision 31593)
@@ -18,9 +18,16 @@
 	Do SpecInfo.Save()
 	
 	Set HalffabRepository = ##class(DOM.PM.Maatwerk.Calc.HF.impl.HalffabRepository).%New()
-	#dim GevondenSpec As TECH.String = HalffabRepository.GeefSpecTag("UTFamilie1","UTVariant","UTTag")
+	Set HalffabRepositoryInput = ##class(DOM.PM.Maatwerk.Calc.HF.HalffabRepositoryInput).%New()
+	Set HalffabRepositoryInput.Familie = "UTFamilie1"
+	Set HalffabRepositoryInput.Variant = "UTVariant"
+	Set HalffabRepositoryInput.BerekenTag = "UTTag"
+	#dim GevondenSpec As TECH.String = HalffabRepository.GeefSpecificatie(HalffabRepositoryInput)
 	Do $$$AssertEquals(GevondenSpec.%ClassName(1),##class(vhTest.Dummy.DOM.PM.Maatwerk.Calc.HF.HalffabSpec).%ClassName(1),"De gevonden spec is gelijk")
-	Set GevondenSpec = HalffabRepository.GeefSpecDatum("UTFamilie2","UTVariant")
+	Set HalffabRepositoryInput = ##class(DOM.PM.Maatwerk.Calc.HF.HalffabRepositoryInput).%New()
+	Set HalffabRepositoryInput.Familie = "UTFamilie2"
+	Set HalffabRepositoryInput.Variant = "UTVariant"
+	Set GevondenSpec = HalffabRepository.GeefSpecificatie(HalffabRepositoryInput)
 	Do $$$AssertEquals(GevondenSpec.%ClassName(1),##class(vhTest.Dummy.DOM.PM.Maatwerk.Calc.HF.HalffabSpec).%ClassName(1),"De gevonden spec is gelijk")
 
 	Do ..Cleanup()
Index: DOM/PM/Maatwerk/Calc/HF/IHalffabRepository.cls.xml
===================================================================
diff -u -r29059 -r31593
--- DOM/PM/Maatwerk/Calc/HF/IHalffabRepository.cls.xml	(.../IHalffabRepository.cls.xml)	(revision 29059)
+++ DOM/PM/Maatwerk/Calc/HF/IHalffabRepository.cls.xml	(.../IHalffabRepository.cls.xml)	(revision 31593)
@@ -3,19 +3,13 @@
 <Class name="DOM.PM.Maatwerk.Calc.HF.IHalffabRepository">
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject</Super>
+<Super>TECH.Interface</Super>
 
-<Method name="GeefSpecDatum">
+<Method name="GeefSpecificatie">
 <Abstract>1</Abstract>
-<FormalSpec>Familie:DOM.PM.enu.Familie,Variant:DOM.PM.enu.Variant,BerekenDatum:%Date</FormalSpec>
+<FormalSpec>SpecificatieInput:DOM.PM.Maatwerk.Calc.HF.HalffabRepositoryInput</FormalSpec>
 <ReturnType>DOM.PM.Maatwerk.Calc.HF.HalffabSpec</ReturnType>
 </Method>
-
-<Method name="GeefSpecTag">
-<Abstract>1</Abstract>
-<FormalSpec>Familie:DOM.PM.enu.Familie,Variant:DOM.PM.enu.Variant,BerekenTag:%String</FormalSpec>
-<ReturnType>DOM.PM.Maatwerk.Calc.HF.HalffabSpec</ReturnType>
-</Method>
 </Class>
 
 
Index: DOM/PM/Maatwerk/Calc/HF/impl/HalffabRepository.cls.xml
===================================================================
diff -u -r29059 -r31593
--- DOM/PM/Maatwerk/Calc/HF/impl/HalffabRepository.cls.xml	(.../HalffabRepository.cls.xml)	(revision 29059)
+++ DOM/PM/Maatwerk/Calc/HF/impl/HalffabRepository.cls.xml	(.../HalffabRepository.cls.xml)	(revision 31593)
@@ -8,31 +8,38 @@
 <ClassType/>
 <IncludeCode>TECH.Error</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>DOM.PM.Maatwerk.Calc.HF.IHalffabRepository</Super>
+<Super>TECH.RegisteredObject,DOM.PM.Maatwerk.Calc.HF.IHalffabRepository</Super>
 
-<Method name="GeefSpecDatum">
-<FormalSpec>Familie:DOM.PM.enu.Familie,Variant:DOM.PM.enu.Variant,BerekenDatum:%Date=""</FormalSpec>
-<ReturnType>DOM.PM.Maatwerk.Calc.HF.HalffabSpec</ReturnType>
+<Property name="QueryUitvoerder">
+<Type>TECH.Query.QueryUitvoerder</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	If (BerekenDatum = "") {
-		Set BerekenDatum = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDateVoorQueries()
-	}
-	
-	
-	#dim Query As %String = "SELECT ID FROM DOM_PM_Maatwerk_Calc_HF_impl.HalffabSpecInfo WHERE Familie = ? AND Variant = ? AND GeldigVan <= ? AND GeldigTot >= ? AND Tag is null"
-	#dim ResultSet As TECH.ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GeefQueryUitvoerder().VoerUit(Query, $ListBuild(Familie, Variant, BerekenDatum, BerekenDatum))
-	
-	Quit ..GeefHalffabSpec(ResultSet)
+	Set ..QueryUitvoerder = ##class(TECH.Context).Instance().GeefQueryAPI().GeefQueryUitvoerder()
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
-<Method name="GeefSpecTag">
-<FormalSpec>Familie:DOM.PM.enu.Familie,Variant:DOM.PM.enu.Variant,BerekenTag:%String</FormalSpec>
+<Method name="GeefSpecificatie">
+<FormalSpec>SpecificatieInput:DOM.PM.Maatwerk.Calc.HF.HalffabRepositoryInput</FormalSpec>
 <ReturnType>DOM.PM.Maatwerk.Calc.HF.HalffabSpec</ReturnType>
 <Implementation><![CDATA[
-	#dim Query As %String = "SELECT ID FROM DOM_PM_Maatwerk_Calc_HF_impl.HalffabSpecInfo WHERE Familie = ? AND Variant = ? AND Tag = ?"
-	#dim ResultSet As TECH.ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GeefQueryUitvoerder().VoerUit(Query, $ListBuild(Familie, Variant, BerekenTag))
-	
+	#dim Query As %String = "SELECT ID FROM DOM_PM_Maatwerk_Calc_HF_impl.HalffabSpecInfo WHERE Familie = ? AND Variant = ? AND "
+	#dim Params As %List = $ListBuild(SpecificatieInput.Familie, SpecificatieInput.Variant)
+	If SpecificatieInput.BerekenTag = "" {
+		Set Query = Query_"GeldigVan <= ? AND GeldigTot >= ? AND Tag is null"
+		Set Params = Params_$ListBuild(SpecificatieInput.BerekenDatum, SpecificatieInput.BerekenDatum)
+	} Else {
+		Set Query = Query_"Tag = ?"
+		Set Params = Params_$ListBuild(SpecificatieInput.BerekenTag)
+	}
+	#dim ResultSet As TECH.ResultSet = ##class(TECH.Context).Instance().GeefQueryAPI().GeefQueryUitvoerder().VoerUit(Query, Params)
 	Quit ..GeefHalffabSpec(ResultSet)
 ]]></Implementation>
 </Method>
Index: DOM/PM/Maatwerk/Calc/HF/HalffabContext.cls.xml
===================================================================
diff -u -r31361 -r31593
--- DOM/PM/Maatwerk/Calc/HF/HalffabContext.cls.xml	(.../HalffabContext.cls.xml)	(revision 31361)
+++ DOM/PM/Maatwerk/Calc/HF/HalffabContext.cls.xml	(.../HalffabContext.cls.xml)	(revision 31593)
@@ -86,14 +86,15 @@
 	Set ..Variant = Variant
 	Set ..BerekeningsSpecificatie = BerekeningsSpecificatie
 	Set ..KlantOrderInstellingen = ##class(DOM.VKP.impl.DataM.KlantOrderInstellingenImpl).%New(BerekeningsSpecificatie.GeefKlantID())
+	Set ..BerekenDatum = ..GeefBerekenDatum()
 	Try {
 		Set HalffabRepository = ##class(DOM.PM.Maatwerk.Calc.HF.impl.HalffabRepository).%New()
-		If (..BerekeningsSpecificatie.GeefBerekenTag() '= "") {
-			Set ..HalffabSpec = HalffabRepository.GeefSpecTag(..Familie, ..Variant, ..BerekeningsSpecificatie.GeefBerekenTag())
-		} Else {
-			Set ..BerekenDatum = ..GeefBerekenDatum()
-			Set ..HalffabSpec = HalffabRepository.GeefSpecDatum(..Familie, ..Variant, ..BerekenDatum)
-		}
+		Set HalffabRepositoryInput = ##class(DOM.PM.Maatwerk.Calc.HF.HalffabRepositoryInput).%New()
+		Set HalffabRepositoryInput.Familie = ..Familie
+		Set HalffabRepositoryInput.Variant = ..Variant
+		Set HalffabRepositoryInput.BerekenDatum = ..BerekenDatum
+		Set HalffabRepositoryInput.BerekenTag = ..BerekeningsSpecificatie.GeefBerekenTag()
+		Set ..HalffabSpec = HalffabRepository.GeefSpecificatie(HalffabRepositoryInput)
 		Set ..BewerkingsInfoTabel = ##class(DOM.PM.Maatwerk.Calc.HF.impl.BewerkingsInfoTabel).%New()
 	 	Set ..HalffabItemsBoom = ##class(DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New()
 	}
Index: DOM/PM/Maatwerk/Calc/HF/HalffabRepositoryInput.cls.xml
===================================================================
diff -u
--- DOM/PM/Maatwerk/Calc/HF/HalffabRepositoryInput.cls.xml	(revision 0)
+++ DOM/PM/Maatwerk/Calc/HF/HalffabRepositoryInput.cls.xml	(revision 31593)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.PM.Maatwerk.Calc.HF.HalffabRepositoryInput">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="Familie">
+<Type>DOM.PM.enu.Familie</Type>
+</Property>
+
+<Property name="Variant">
+<Type>DOM.PM.enu.Variant</Type>
+</Property>
+
+<Property name="BerekenDatum">
+<Type>%Date</Type>
+</Property>
+
+<Property name="BerekenTag">
+<Type>TECH.String</Type>
+</Property>
+
+<Method name="BerekenDatumGet">
+<ReturnType>%Date</ReturnType>
+<Implementation><![CDATA[
+	If i%BerekenDatum="" {
+		Set i%BerekenDatum = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentDateVoorQueries()
+	}
+	Quit i%BerekenDatum
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>