Index: DOM/PM/Maatwerk/Calc/HF/IHalffabItem.cls.xml
===================================================================
diff -u -r30191 -r30286
--- DOM/PM/Maatwerk/Calc/HF/IHalffabItem.cls.xml	(.../IHalffabItem.cls.xml)	(revision 30191)
+++ DOM/PM/Maatwerk/Calc/HF/IHalffabItem.cls.xml	(.../IHalffabItem.cls.xml)	(revision 30286)
@@ -13,7 +13,7 @@
 <ClassType/>
 <IncludeCode>TECH.Error</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject</Super>
+<Super>TECH.RegisteredObject</Super>
 
 <Property name="Rol">
 <Type>%String</Type>
@@ -68,12 +68,17 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="ParentItem">
+<Type>DOM.PM.Maatwerk.Calc.HF.IHalffabItem</Type>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>Context:DOM.PM.Maatwerk.Calc.HF.HalffabContext,Rol:%String</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
+	Do:'$length(Rol) ##class(TECH.Exceptions.InvalidInputException).Throw("Rol is vereist")
 	Set ..Context=Context
 	Set ..Rol=Rol
 	Quit $$$OK
@@ -112,7 +117,16 @@
 
 <Method name="GeefVolledigeRolNaam">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit ..VolledigeRolNaam
+<Implementation><![CDATA[
+	quit:$length(..VolledigeRolNaam) ..VolledigeRolNaam
+	
+	#dim Item As  DOM.PM.Maatwerk.Calc.HF.HalffabItem = $this
+	#dim VolledigeNaam As %String = ""
+	while $IsObject(Item) {
+		set VolledigeNaam = Item.GeefRol()_ $$$IfLength(VolledigeNaam,".","")
+		set Item = Item.ParentItem
+	} 
+	quit VolledigeNaam
 ]]></Implementation>
 </Method>
 
@@ -162,6 +176,12 @@
 <Implementation><![CDATA[	Set ..Rol = Rol
 ]]></Implementation>
 </Method>
+
+<Method name="GeefKindIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ##class(TECH.PiecesIterator).%New("","")
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: DOM/PM/Maatwerk/Calc/HF/HalffabItemsIterator.cls.xml
===================================================================
diff -u
--- DOM/PM/Maatwerk/Calc/HF/HalffabItemsIterator.cls.xml	(revision 0)
+++ DOM/PM/Maatwerk/Calc/HF/HalffabItemsIterator.cls.xml	(revision 30286)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.PM.Maatwerk.Calc.HF.HalffabItemsIterator">
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+
+<Property name="ItemIterator">
+<Type>TECH.Iterator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Rol">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Boom">
+<Type>DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="CanCalculateNext">
+<Type>%Boolean</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="NextItem">
+<Type>DOM.PM.Maatwerk.Calc.HF.ConcreetHalffabItem</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Boom:DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom,Rol:%String=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	set ..Boom = Boom
+	set ..Rol = Rol
+	do ..Reset()
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="HasNext">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	do ..CalculateNext()
+	quit $IsObject(..NextItem) && ( ..IsValidItem())
+]]></Implementation>
+</Method>
+
+<Method name="Next">
+<ReturnType>DOM.PM.Maatwerk.Calc.HF.ConcreetHalffabItem</ReturnType>
+<Implementation><![CDATA[
+	do ..CalculateNext()
+	set ..CanCalculateNext = $$$true
+	quit ..NextItem
+]]></Implementation>
+</Method>
+
+<Method name="Key">
+<Implementation><![CDATA[	quit ..NextItem.GeefRol()
+]]></Implementation>
+</Method>
+
+<Method name="Reset">
+<Implementation><![CDATA[
+	set ..CanCalculateNext = $$$true
+	set ..ItemIterator = ##class(TECH.Algo.Boom.DiepteEerstIterator).%New(..Boom)
+]]></Implementation>
+</Method>
+
+<Method name="CalculateNext">
+<Private>1</Private>
+<Implementation><![CDATA[
+	if ..CanCalculateNext {
+		set ..NextItem = ..ItemIterator.Next()
+		while $$$Not(..IsValidItem()) && (..ItemIterator.HasNext()) {
+			set ..NextItem = ..ItemIterator.Next()
+		} 	
+		set ..CanCalculateNext = $$$false
+	}
+]]></Implementation>
+</Method>
+
+<Method name="IsValidItem">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit (..NextItem.%Extends("DOM.PM.Maatwerk.Calc.HF.IHalffabItem")) && ( ..IsGeldigeRol())
+]]></Implementation>
+</Method>
+
+<Method name="IsGeldigeRol">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit ( $select($length(..Rol):..NextItem.GeefRol() =..Rol,1:1))
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Fake/DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml
===================================================================
diff -u -r30285 -r30286
--- vhTest/Fake/DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml	(.../HalffabItemsBoom.cls.xml)	(revision 30285)
+++ vhTest/Fake/DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml	(.../HalffabItemsBoom.cls.xml)	(revision 30286)
@@ -18,12 +18,31 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="GeefAlleHalffabItemsIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
+<Method name="GeefConcreteHalffabItemsIterator">
+<FormalSpec>Rol:%String=""</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="GeefHalffabItemsIteratorZonderSamengesteldNiveau">
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
 
+<Method name="GeefKindIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="BevatRol">
 <FormalSpec>Rol:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
Index: DOM/PM/Maatwerk/Calc/HF/SamengesteldHalffabItem.cls.xml
===================================================================
diff -u -r30112 -r30286
--- DOM/PM/Maatwerk/Calc/HF/SamengesteldHalffabItem.cls.xml	(.../SamengesteldHalffabItem.cls.xml)	(revision 30112)
+++ DOM/PM/Maatwerk/Calc/HF/SamengesteldHalffabItem.cls.xml	(.../SamengesteldHalffabItem.cls.xml)	(revision 30286)
@@ -19,6 +19,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefKindIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..HalffabItems)
+]]></Implementation>
+</Method>
+
 <Method name="HeeftHalffabItems">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	quit ..HalffabItems.Count() > 0
@@ -51,7 +57,23 @@
 
 <Method name="VoegToe">
 <FormalSpec>HalffabItem:DOM.PM.Maatwerk.Calc.HF.IHalffabItem</FormalSpec>
-<Implementation><![CDATA[	Do ..HalffabItems.SetAt(HalffabItem,HalffabItem.GeefRol())
+<Implementation><![CDATA[
+	#if 0 && ##class(TECH.Config.ConfigMgr).Instance().GeefOmgeving()="DEV"
+	
+	#dim Item As DOM.PM.Maatwerk.Calc.HF.IHalffabItem = $this
+	while $IsObject(Item) {	
+		if (Item.GeefRol() = HalffabItem.GeefRol()) {
+			do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Toevoegen van rolnaam '"_Item.GeefRol()_"' is mislukt. Dezelfde rolnaam toevoegen in een hierarchie is niet toegelaten."))
+		}
+		set Item = Item.ParentItem
+	} 
+	
+	#endif
+	
+	#dim Status As %Status = ..HalffabItems.SetAt(HalffabItem,HalffabItem.GeefRol())
+	do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(Status,"VoegToe niet gelukt",..E.InvalidInputException)
+	
+	set HalffabItem.ParentItem = $this
 ]]></Implementation>
 </Method>
 
@@ -60,8 +82,7 @@
 <Implementation><![CDATA[
 	#dim Gewicht As %Decimal = 0
 	#dim Iterator As TECH.Iterator = ..GeefHalffabItemsIterator()
-	While (Iterator.HasNext())
-	{
+	While (Iterator.HasNext()) {
 		Set Gewicht = Gewicht + Iterator.Next().Gewicht
 	}
 	Quit Gewicht
Index: vhTest/Mock/DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml
===================================================================
diff -u -r30285 -r30286
--- vhTest/Mock/DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml	(.../HalffabItemsBoom.cls.xml)	(revision 30285)
+++ vhTest/Mock/DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml	(.../HalffabItemsBoom.cls.xml)	(revision 30286)
@@ -27,6 +27,19 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefAlleHalffabItemsIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefAlleHalffabItemsIterator")
+]]></Implementation>
+</Method>
+
+<Method name="GeefConcreteHalffabItemsIterator">
+<FormalSpec>Rol:%String=""</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefConcreteHalffabItemsIterator",Rol)
+]]></Implementation>
+</Method>
+
 <Method name="GeefHalffabItem">
 <FormalSpec>Rol:%String</FormalSpec>
 <ReturnType>DOM.PM.Maatwerk.Calc.HF.IHalffabItem</ReturnType>
@@ -35,8 +48,9 @@
 </Method>
 
 <Method name="GeefHalffabItemsIterator">
+<FormalSpec>Rol:%String=""</FormalSpec>
 <ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefHalffabItemsIterator")
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefHalffabItemsIterator",Rol)
 ]]></Implementation>
 </Method>
 
@@ -46,6 +60,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefKindIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefKindIterator")
+]]></Implementation>
+</Method>
+
 <Method name="VerwijderHalffabItem">
 <FormalSpec>HalffabItem:DOM.PM.Maatwerk.Calc.HF.IHalffabItem</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("VerwijderHalffabItem",HalffabItem)
Index: DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml
===================================================================
diff -u -r30285 -r30286
--- DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml	(.../HalffabItemsBoom.cls.xml)	(revision 30285)
+++ DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom.cls.xml	(.../HalffabItemsBoom.cls.xml)	(revision 30286)
@@ -8,7 +8,6 @@
 <Property name="HalffabItems">
 <Type>DOM.PM.Maatwerk.Calc.HF.IHalffabItem</Type>
 <Collection>array</Collection>
-<Private>1</Private>
 </Property>
 
 <Property name="Wortel">
@@ -26,7 +25,9 @@
 <Description>
 Voegt het HFItem toe aan de Lijst van HalffabItems, maar niet aan de Wortel van de "Boom" </Description>
 <FormalSpec>HalffabItem:DOM.PM.Maatwerk.Calc.HF.IHalffabItem</FormalSpec>
-<Implementation><![CDATA[	Do ..HalffabItems.SetAt(HalffabItem,HalffabItem.GeefRol())
+<Implementation><![CDATA[
+	#dim Status As %Status = ..HalffabItems.SetAt(HalffabItem,HalffabItem.GeefRol())
+	do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(Status,"AddHalffabItem niet gelukt",..E.InvalidInputException)
 ]]></Implementation>
 </Method>
 
@@ -50,6 +51,13 @@
 			Set HalffabItem = HalffabItem.GeefHalffabItem($Piece(Rol,Delimiter,i))
 		}
 	}
+	
+	if HalffabItem="" {
+		set Iterator = ##class(DOM.PM.Maatwerk.Calc.HF.HalffabItemsIterator).%New($this,Rol)
+		if Iterator.HasNext() set HalffabItem = Iterator.Next()
+		do:Iterator.HasNext() ##class(TECH.Exceptions.GeneralErrorException).%New("Meerdere items gevonden met rol '"_Rol_"'")
+	}
+	
 	Quit HalffabItem
 ]]></Implementation>
 </Method>
@@ -61,6 +69,34 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefHalffabItemsIterator">
+<FormalSpec>Rol:%String=""</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[
+	Quit:Rol="" ##class(TECH.ListIterator).%New(..HalffabItems)
+	Quit ##class(DOM.PM.Maatwerk.Calc.HF.HalffabItemsIterator).%New($this,Rol)
+]]></Implementation>
+</Method>
+
+<Method name="GeefAlleHalffabItemsIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.PM.Maatwerk.Calc.HF.HalffabItemsIterator).%New($this)
+]]></Implementation>
+</Method>
+
+<Method name="GeefConcreteHalffabItemsIterator">
+<FormalSpec>Rol:%String=""</FormalSpec>
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	quit ##class(DOM.PM.Maatwerk.Calc.HF.ConcreetHalffabItemsIterator).%New($this,Rol)
+]]></Implementation>
+</Method>
+
+<Method name="GeefKindIterator">
+<ReturnType>TECH.Iterator</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..HalffabItems)
+]]></Implementation>
+</Method>
+
 <Method name="GeefHalffabItemsIteratorZonderSamengesteldNiveau">
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
@@ -90,12 +126,6 @@
 	Quit ##class(TECH.ListIterator).%New(HFItemsZoalsVroeger)
 ]]></Implementation>
 </Method>
-
-<Method name="GeefHalffabItemsIterator">
-<ReturnType>TECH.Iterator</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.ListIterator).%New(..HalffabItems)
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhUnitTest/DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom/Test.cls.xml	(revision 0)
+++ vhUnitTest/DOM/PM/Maatwerk/Calc/HF/HalffabItemsBoom/Test.cls.xml	(revision 30286)
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="Boom">
+<Type>DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	do ##super(aTestName)
+	set ..Boom = ##class(DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test1 : Lege boom geen items">
+<Implementation><![CDATA[	do ..AssertItemCount(0)
+]]></Implementation>
+</Method>
+
+<Method name="Test : StandaardItem in boom">
+<Implementation><![CDATA[
+	do ..Boom.AddHalffabItem(..MaakStandaardItem("Std"))
+	do ..AssertItemCount(1)
+]]></Implementation>
+</Method>
+
+<Method name="Test : Twee verschillende items in boom">
+<Implementation><![CDATA[
+	do ..Boom.AddHalffabItem(..MaakStandaardItem("Std1"))
+	do ..Boom.AddHalffabItem(..MaakStandaardItem("Std2"))
+	
+	do ..AssertItemCount(2)
+]]></Implementation>
+</Method>
+
+<Method name="Test : StandaardItem 2de maal in boom -&gt; item wordt overschreven">
+<Implementation><![CDATA[
+	#dim StandaardItem As DOM.PM.Maatwerk.Calc.HF.StandaardHalffabItem= ..MaakStandaardItem("Std")
+	do ..Boom.AddHalffabItem(StandaardItem)
+	do ..Boom.AddHalffabItem(StandaardItem)
+	
+	do ..AssertItemCount(1)
+]]></Implementation>
+</Method>
+
+<Method name="Test : StandaardItem en SamengesteldItem">
+<Implementation><![CDATA[
+	do ..Boom.AddHalffabItem(..MaakStandaardItem("Std"))
+	do ..Boom.AddHalffabItem(..MaakSamengesteldItem("Sam",1))
+	
+	do $$$AssertEquals(..Boom.HalffabItems.Count(),2)
+	
+	do ..AssertItemCount(2)
+]]></Implementation>
+</Method>
+
+<Method name="Test : Sub-item kan verkregen worden via het hierarchisch pad in &apos;-&gt;&apos; notatie">
+<Implementation><![CDATA[
+	do ..Boom.AddHalffabItem(..MaakSamengesteldItem("HoofdSam1",2,"Std"))
+	do ..Boom.AddHalffabItem(..MaakSamengesteldItem("HoofdSam2",2,"Sam"))
+	
+	do $$$AssertTrue(..Boom.BevatRol("HoofdSam1->Std1"))
+	do $$$AssertEquals(..Boom.GeefHalffabItem("HoofdSam1->Std1").GeefVolledigeRolNaam(),"HoofdSam1.Std1")
+	
+	do $$$AssertTrue(..Boom.BevatRol("HoofdSam1->Std2"))
+	do $$$AssertEquals(..Boom.GeefHalffabItem("HoofdSam1->Std2").GeefVolledigeRolNaam(),"HoofdSam1.Std2")
+	
+	do $$$AssertTrue(..Boom.BevatRol("HoofdSam2->Sam1"))
+	do $$$AssertEquals(..Boom.GeefHalffabItem("HoofdSam2->Sam1").GeefVolledigeRolNaam(),"HoofdSam2.Sam1")
+	
+	do $$$AssertTrue(..Boom.BevatRol("HoofdSam2->Sam1->Std1"))
+	do $$$AssertEquals(..Boom.GeefHalffabItem("HoofdSam2->Sam1->Std1").GeefVolledigeRolNaam(),"HoofdSam2.Sam1.Std1")
+	
+	do $$$AssertTrue(..Boom.BevatRol("HoofdSam2->Sam2"))
+	do $$$AssertEquals(..Boom.GeefHalffabItem("HoofdSam2->Sam2").GeefVolledigeRolNaam(),"HoofdSam2.Sam2")
+	
+	do $$$AssertTrue(..Boom.BevatRol("HoofdSam2->Sam2->Std1"))
+	do $$$AssertEquals(..Boom.GeefHalffabItem("HoofdSam2->Sam2->Std1").GeefVolledigeRolNaam(),"HoofdSam2.Sam2.Std1")
+]]></Implementation>
+</Method>
+
+<Method name="Test : Sub-item kan verkregen worden via het hierarchisch pad in &apos;-&gt;&apos; notatie - ook als er een afwijkende rol naam is ingesteld">
+<Implementation><![CDATA[
+	set Hoofd = ##class(DOM.PM.Maatwerk.Calc.HF.SamengesteldHalffabItem).%New("","Hoofd")
+	#dim ItemA As DOM.PM.Maatwerk.Calc.HF.StandaardHalffabItem = ..MaakStandaardItem("ItemA")
+	do Hoofd.VoegToe(ItemA)
+	
+	#dim ItemB As DOM.PM.Maatwerk.Calc.HF.StandaardHalffabItem = ..MaakStandaardItem("ItemB")
+	do ItemB.ZetVolledigeRolNaam("Afwijkende volledigerolnaam")
+	do Hoofd.VoegToe(ItemB)
+	
+	do ..Boom.AddHalffabItem(Hoofd)
+
+	do $$$AssertTrue(..Boom.BevatRol("Hoofd->ItemA"))
+	do $$$AssertEquals(..Boom.GeefHalffabItem("Hoofd->ItemA").GeefVolledigeRolNaam(),"Hoofd.ItemA")
+	
+	do $$$AssertTrue(..Boom.BevatRol("Hoofd->ItemB"))
+	do $$$AssertEquals(..Boom.GeefHalffabItem("Hoofd->ItemB").GeefVolledigeRolNaam(),"Afwijkende volledigerolnaam")
+]]></Implementation>
+</Method>
+
+<Method name="Test: GeefHalffabIterator met opgegeven rol">
+<Implementation><![CDATA[
+	do ..Boom.AddHalffabItem(..MaakSamengesteldItem("HoofdSam1",2,"Std"))
+	do ..Boom.AddHalffabItem(..MaakSamengesteldItem("HoofdSam2",2,"Sam"))
+	
+	#dim Iterator = ..Boom.GeefHalffabItemsIterator("HoofdSam2")
+	
+	do $$$AssertTrue(Iterator.HasNext())
+	do $$$AssertEquals(Iterator.Next().GeefVolledigeRolNaam(),"HoofdSam2")
+	do $$$AssertFalse(Iterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="Test : Concrete halffabItem iterator">
+<Implementation><![CDATA[
+	do ..Boom.AddHalffabItem(..MaakSamengesteldItem("HoofdSam1",2,"Std"))
+	do ..Boom.AddHalffabItem(..MaakSamengesteldItem("HoofdSam2",2,"Sam"))
+	
+	#dim Iterator = ..Boom.GeefConcreteHalffabItemsIterator()
+	
+	do $$$AssertTrue(Iterator.HasNext())
+	
+	do $$$AssertEquals(Iterator.Next().GeefVolledigeRolNaam(),"HoofdSam1.Std1")
+	do $$$AssertEquals(Iterator.Next().GeefVolledigeRolNaam(),"HoofdSam1.Std2")
+	do $$$AssertEquals(Iterator.Next().GeefVolledigeRolNaam(),"HoofdSam2.Sam1.Std1")
+	do $$$AssertEquals(Iterator.Next().GeefVolledigeRolNaam(),"HoofdSam2.Sam2.Std1")
+	
+	do $$$AssertFalse(Iterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="Test : Concrete halffabItem iterator - met opgegeven rol">
+<Implementation><![CDATA[
+	do ..Boom.AddHalffabItem(..MaakSamengesteldItem("HoofdSam1",2,"Std"))
+	do ..Boom.AddHalffabItem(..MaakSamengesteldItem("HoofdSam2",2,"Sam"))
+	
+	#dim Iterator = ..Boom.GeefConcreteHalffabItemsIterator("Std1")
+	
+	do $$$AssertTrue(Iterator.HasNext())
+	
+	do $$$AssertEquals(Iterator.Next().GeefVolledigeRolNaam(),"HoofdSam1.Std1")
+	do $$$AssertEquals(Iterator.Next().GeefVolledigeRolNaam(),"HoofdSam2.Sam1.Std1")
+	do $$$AssertEquals(Iterator.Next().GeefVolledigeRolNaam(),"HoofdSam2.Sam2.Std1")
+	
+	do $$$AssertFalse(Iterator.HasNext())
+]]></Implementation>
+</Method>
+
+<Method name="aTest: Dezelfde rol toevoegen in een hiearchie is niet toegelaten">
+<Implementation><![CDATA[
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Dezelfde rolnaam toevoegen in een hierarchie is niet toegelaten")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(..E.InvalidInputException,Substrings))
+	
+	set SamengesteldItem = ##class(DOM.PM.Maatwerk.Calc.HF.SamengesteldHalffabItem).%New("","Rol")
+	do SamengesteldItem.VoegToe(SamengesteldItem)
+]]></Implementation>
+</Method>
+
+<Method name="aTest: Dezelfde rolnaam toevoegen in een hiearchie is niet toegelaten">
+<Implementation><![CDATA[
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Dezelfde rolnaam toevoegen in een hierarchie is niet toegelaten")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(..E.InvalidInputException,Substrings))
+	
+	set SamengesteldItem1 = ##class(DOM.PM.Maatwerk.Calc.HF.SamengesteldHalffabItem).%New("","Rol")
+	set SamengesteldItem2 = ##class(DOM.PM.Maatwerk.Calc.HF.SamengesteldHalffabItem).%New("","Rol")
+	do SamengesteldItem1.VoegToe(SamengesteldItem2)
+]]></Implementation>
+</Method>
+
+<Method name="Test : Indien HalffabItem meerdere malen voorkomt zal GeefHalffabItem een error throwen">
+<Implementation><![CDATA[
+	do ..Boom.AddHalffabItem(..MaakStandaardItem("Std1"))
+	do ..Boom.AddHalffabItem(..MaakSamengesteldItem("Sam1",2,"Std"))
+	
+	do $$$AssertTrue(..Boom.BevatRol("Std1"))
+	do $$$AssertTrue(..Boom.BevatRol("Sam1->Std1"))
+	
+	do ..Boom.GeefHalffabItem("Sam1")
+]]></Implementation>
+</Method>
+
+<Method name="MaakStandaardItem">
+<FormalSpec>Naam:%String,Aantal:%Integer=1</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set StandaardItem = ##class(DOM.PM.Maatwerk.Calc.HF.StandaardHalffabItem).%New("", Naam, "")
+	quit StandaardItem
+]]></Implementation>
+</Method>
+
+<Method name="MaakSamengesteldItem">
+<FormalSpec>Naam:%String,AantalTeMakenItems:%Integer,ItemType:%String="Std",Aantal:%Integer=1</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set SamengesteldItem = ##class(DOM.PM.Maatwerk.Calc.HF.SamengesteldHalffabItem).%New("",Naam)
+	#dim Counter As %Integer
+	for Counter = 1 : 1 : AantalTeMakenItems {
+		#dim Item As DOM.PM.Maatwerk.Calc.HF.IHalffabItem
+		set:(ItemType = "Std") Item = ..MaakStandaardItem("Std"_Counter,Aantal_Counter) 
+		set:(ItemType = "Sam") Item = ..MaakSamengesteldItem("Sam"_Counter,1,"Std",Aantal_Counter) 
+		do SamengesteldItem.VoegToe(Item)
+	}
+	quit SamengesteldItem
+]]></Implementation>
+</Method>
+
+<Method name="AssertItemCount">
+<FormalSpec>VerwachtAantal:%Integer</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim Iterator As TECH.Iterator = ..Boom.GeefHalffabItemsIterator()
+	#dim Aantal As %String = 0
+	while Iterator.HasNext() {
+		set Aantal = $increment(Aantal)
+		#dim HalffabItem As DOM.PM.Maatwerk.Calc.HF.IHalffabItem = Iterator.Next()
+	}
+	do $$$AssertEquals(Aantal,VerwachtAantal)
+	quit Aantal
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/PM/Maatwerk/Calc/HF/ConcreetHalffabItemsIterator.cls.xml
===================================================================
diff -u
--- DOM/PM/Maatwerk/Calc/HF/ConcreetHalffabItemsIterator.cls.xml	(revision 0)
+++ DOM/PM/Maatwerk/Calc/HF/ConcreetHalffabItemsIterator.cls.xml	(revision 30286)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.PM.Maatwerk.Calc.HF.ConcreetHalffabItemsIterator">
+<Super>DOM.PM.Maatwerk.Calc.HF.HalffabItemsIterator</Super>
+
+<Method name="IsValidItem">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	quit (..NextItem.%Extends("DOM.PM.Maatwerk.Calc.HF.ConcreetHalffabItem")) && ..IsGeldigeRol()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>