Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/RugBoring.cls.xml
===================================================================
diff -u -r59846 -r59917
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/RugBoring.cls.xml	(.../RugBoring.cls.xml)	(revision 59846)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/RugBoring.cls.xml	(.../RugBoring.cls.xml)	(revision 59917)
@@ -12,17 +12,23 @@
 <Parameter name="XMLNAME" value="svg"/>
 </Property>
 
+<Property name="BasisElementFactory">
+<Type>TECH.Svg.BasisElementFactory</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer</FormalSpec>
+<FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,BasisElementFactory:TECH.Svg.BasisElementFactory=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set BasisElementFactory = ##class(TECH.Svg.BasisElementFactory).%New()
+	;Set ..BasisElementFactory = $$$Inject(BasisElementFactory, ##class(TECH.Svg.BasisElementFactory).%New())
+	Set ..BasisElementFactory =##class(TECH.Svg.BasisElementFactory).%New()
 	#Dim CrossDiag as APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag = ##class(APPS.Halux.PPS.ALUFrees.Svg.BasisElement.CrossDiag).%New(Width,Height)
-	Set Circle = BasisElementFactory.MaakCirkel(Width/2,Height/2,(Width/2.2))
-	Set ..SvgBox = BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
+	Set Circle = ..BasisElementFactory.MaakCirkel(Width/2,Height/2,(Width/2.2))
+	Set ..SvgBox = ..BasisElementFactory.MaakSvgBox((MidX-(Width/2)),(MidY-(Height/2)), Width, Height)
 	DO ..SvgBox.VoegToeElement(CrossDiag)
 	DO ..SvgBox.VoegToeElement(Circle)
 	DO ..SvgBox.VoegToeID("rugboring")
@@ -63,6 +69,9 @@
 <Value name="10">
 <Value>SvgBox</Value>
 </Value>
+<Value name="11">
+<Value>BasisElementFactory</Value>
+</Value>
 </Data>
 </Storage>
 </Class>
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/ZijBoring.cls.xml
===================================================================
diff -u -r59846 -r59917
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/ZijBoring.cls.xml	(.../ZijBoring.cls.xml)	(revision 59846)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Boring/ZijBoring.cls.xml	(.../ZijBoring.cls.xml)	(revision 59917)
@@ -13,7 +13,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,Rotation:%Integer</FormalSpec>
+<FormalSpec>MidX:%Integer,MidY:%Integer,Width:%Integer,Height:%Integer,Rotation:%Integer=0</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
Index: APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/Boringen.cls.xml
===================================================================
diff -u -r59846 -r59917
--- APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/Boringen.cls.xml	(.../Boringen.cls.xml)	(revision 59846)
+++ APPS/Halux/PPS/ALUFrees/Svg/KaderdeurElement/Beslag/Boringen.cls.xml	(.../Boringen.cls.xml)	(revision 59917)
@@ -50,7 +50,6 @@
 		ElseIf(Boring.BoorDiameter<0)||(Boring.BoorDiepte=0){
 			Set DoorBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring).%New(XPos,YPos,10,10)
 			Do ..Group.VoegToeElement(DoorBoring)
-			
 		}
 		Else {
 		
@@ -68,6 +67,69 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VoegToeBeslagBoringen">
+<FormalSpec>Beslag:Res.PI.Beslag,Plaats:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ..Group.VoegToeID("Boringen")
+	#dim Boringen As list of Prod.GADef.emKadBoring = Beslag.Boringen
+	#dim Boring As Prod.GADef.emKadBoring = ##class(Prod.GADef.emKadBoring).%New()
+	#dim BoringenIterator as TECH.ListIterator = ##class(TECH.ListIterator).%New(Boringen)
+	While (BoringenIterator.HasNext()) {
+		Set Boring = BoringenIterator.Next()
+		Set XPos=Boring.XPos
+ 		Set YPos=Boring.YPos
+ 		Set GrootteBoring=$S(Boring.BoorDiameter<0:0,1:Boring.BoorDiameter)
+ 		Set Rotation=$S(Plaats="PL":0, Plaats="PB":90, Plaats="PR":180, Plaats="PO":270, 1:0)   ; Externe boring
+ 		Set strColor="blue"
+		Set BoorType = Boring.BoringType
+		Set BoorType=$S((Boring.BoringType="EX")!(Boring.BoringType="IN"):"Z", 1:Boring.BoringType)
+		If ($L(Boring.VmlID)>2) {
+			Set BeslagBoringSpecialeVorm = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Beslag.BeslagBoringSpecialeVorm).%New(Boring.VmlID, XPos, YPos, Rotation)
+			Do ..Group.VoegToeElement(BeslagBoringSpecialeVorm)
+		}
+		ElseIf (BoorType="Z") {
+			Do ##class(Tools.Wlip).%New(238).String(Boring.VmlID)
+			Set GrootteBoring = 14
+			Set Rotation=$S(Plaats="PL":0, Plaats="PB":90, Plaats="PR":180, Plaats="PO":270, 1:0)
+			Set ZijBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.ZijBoring).%New(XPos,YPos,GrootteBoring,GrootteBoring,Rotation)
+			Do ..Group.VoegToeElement(ZijBoring)
+		}
+		ElseIf(Boring.IsSpecialeBoring()){
+			Set GrootteBoring = 10
+			Set SpecialeBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.SpecialeBoring).%New(XPos,YPos,GrootteBoring,GrootteBoring)
+		;	Do ##class(Tools.Wlip).%New(238).ObjToXML(SpecialeBoring)
+			Do ..Group.VoegToeElement(SpecialeBoring)
+		}
+		ElseIf (Boring.BoorDiepte < 0) {
+		
+			Set Circle= ##class(TECH.Svg.BasisElementFactory).%New().MaakCirkel(XPos,YPos,GrootteBoring/2)
+			Do Circle.SetFill(##class(TECH.Svg.enu.Kleur).Zwart())
+			Do ..Group.VoegToeElement(Circle)
+		}
+		ElseIf(Boring.BoorDiameter<0)||(Boring.BoorDiepte=0){
+		
+			Set GrootteBoring = 10
+			Set DoorBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring).%New(XPos,YPos,GrootteBoring,GrootteBoring)
+			Do ..Group.VoegToeElement(DoorBoring)
+		}
+		Else {
+			Do ##class(Tools.Wlip).%New(238).String(BoorType)
+			If (GrootteBoring<10) {
+				Do ##class(Tools.Wlip).%New(238).String("else")
+				Set RugBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.RugBoring).%New(XPos, YPos,GrootteBoring,GrootteBoring)
+				Do RugBoring.SetFill(##class(TECH.Svg.enu.Kleur).Zwart())
+				Do ..Group.VoegToeElement(RugBoring)
+			}
+		}	
+		If (BoorType = "Z"), (Boring.BoorDiepte<0) {
+			Set DoorBoring = ##class(APPS.Halux.PPS.ALUFrees.Svg.KaderdeurElement.Boring.DoorBoring).%New(XPos,YPos,GrootteBoring,GrootteBoring)
+			Do ..Group.VoegToeElement(DoorBoring)
+		}
+		
+	}
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <Data name="DomElementState">