Index: BL/Flow/Offerte/impl/KADParameterWrapper.cls.xml
===================================================================
diff -u -r3978 -r4005
--- BL/Flow/Offerte/impl/KADParameterWrapper.cls.xml	(.../KADParameterWrapper.cls.xml)	(revision 3978)
+++ BL/Flow/Offerte/impl/KADParameterWrapper.cls.xml	(.../KADParameterWrapper.cls.xml)	(revision 4005)
@@ -5,16 +5,18 @@
 Specifieke implemenatie van IKADWrapper
 Deze versie wordt gebruikt door oa New Sobelwood</Description>
 <IncludeCode>vhLib.Macro</IncludeCode>
-<Super>BL.Flow.Offerte.IKADWrapper</Super>
+<Super>BL.Flow.Offerte.IKADParameterWrapper</Super>
 
 <Property name="Parameters">
 <Type>BL.Flow.Offerte.dto.KADEDI.Parameter</Type>
 <Collection>list</Collection>
+<Private>1</Private>
 </Property>
 
 <Property name="GlasKleurMapping">
 <Type>%String</Type>
 <Collection>array</Collection>
+<Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
@@ -25,28 +27,27 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..Parameters = Parameters
-	
 	Set ..GlasKleurMapping = ##class(%ArrayOfDataTypes).%New()
-	Do ..GlasKleurMapping.SetAt("1001 caramel","")
-	Do ..GlasKleurMapping.SetAt("1013 blanc perle","ALVULXA")
-	Do ..GlasKleurMapping.SetAt("1271 jaune ocre","ALVULXO")
-	Do ..GlasKleurMapping.SetAt("1272 beige sable","ALVULZB")
-	Do ..GlasKleurMapping.SetAt("1398 beige","ALVULXI")
-	Do ..GlasKleurMapping.SetAt("1849 beige claire","ALVULPW")
-	Do ..GlasKleurMapping.SetAt("1957 mokka","ALVULDB")
-	Do ..GlasKleurMapping.SetAt("2001 orange classique","")
-	Do ..GlasKleurMapping.SetAt("2003 orange","")
-	Do ..GlasKleurMapping.SetAt("2132 rose pastel","ALVULPZ")
-	Do ..GlasKleurMapping.SetAt("2133 rouge pastel","ALVULPR")
-	Do ..GlasKleurMapping.SetAt("3002 rouge vif","ALVULPL")
-	Do ..GlasKleurMapping.SetAt("3004 rouge fonce","ALVULRO")
-	Do ..GlasKleurMapping.SetAt("3005 rouge","ALVULXR")
-	Do ..GlasKleurMapping.SetAt("3009 oxyde","ALVULPB")
-	Do ..GlasKleurMapping.SetAt("3501 extra blanc","ALVULPE")
-	Do ..GlasKleurMapping.SetAt("4006 fuchsia","ALVULFU")
-	Do ..GlasKleurMapping.SetAt("4139 pourpre","ALVULPP")
-	Do ..GlasKleurMapping.SetAt("4247 lilas","ALVULLI")
-	Do ..GlasKleurMapping.SetAt("5023 bleu profond","ALVULXV")
+	Do ..GlasKleurMapping.SetAt("","1001 caramel")
+	Do ..GlasKleurMapping.SetAt("ALVULXA","1013 blanc perle")
+	Do ..GlasKleurMapping.SetAt("ALVULXO","1271 jaune ocre")
+	Do ..GlasKleurMapping.SetAt("ALVULZB","1272 beige sable")
+	Do ..GlasKleurMapping.SetAt("ALVULXI","1398 beige")
+	Do ..GlasKleurMapping.SetAt("ALVULPW","1849 beige claire")
+	Do ..GlasKleurMapping.SetAt("ALVULDB","1957 mokka")
+	Do ..GlasKleurMapping.SetAt("","2001 orange classique")
+	Do ..GlasKleurMapping.SetAt("","2003 orange")
+	Do ..GlasKleurMapping.SetAt("ALVULPZ","2132 rose pastel")
+	Do ..GlasKleurMapping.SetAt("ALVULPR","2133 rouge pastel")
+	Do ..GlasKleurMapping.SetAt("ALVULPL","3002 rouge vif")
+	Do ..GlasKleurMapping.SetAt("ALVULRO","3004 rouge fonce")
+	Do ..GlasKleurMapping.SetAt("ALVULXR","3005 rouge")
+	Do ..GlasKleurMapping.SetAt("ALVULPB","3009 oxyde")
+	Do ..GlasKleurMapping.SetAt("ALVULPE","3501 extra blanc")
+	Do ..GlasKleurMapping.SetAt("ALVULFU","4006 fuchsia")
+	Do ..GlasKleurMapping.SetAt("ALVULPP","4139 pourpre")
+	Do ..GlasKleurMapping.SetAt("ALVULLI","4247 lilas")
+	Do ..GlasKleurMapping.SetAt("ALVULXV","5023 bleu profond")
 	Do ..GlasKleurMapping.SetAt("5339 bleu clair pastel","ALVULXB")
 	Do ..GlasKleurMapping.SetAt("5930 bleu fonce","ALVULDL")
 	Do ..GlasKleurMapping.SetAt("6331 vert clair pastel","ALVULXP")
@@ -107,44 +108,55 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefBeslag">
+<Method name="GeefBeslagID">
 <ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	/// Definitieve waarden ophalen uit XML (nog te bespreken met NewSobelwood)
+	Set IsSmalProfiel=($E(..GeefProfielType(),2)="S")
+	Quit "BLUM"_$S(IsSmalProfiel:"K", 1:"S")
+]]></Implementation>
 </Method>
 
 <Method name="GeefAantalBeslag">
 <ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	Quit ..GeefBeslagParameters().Count() - 1
+]]></Implementation>
 </Method>
 
-<Method name="GeefAantalGlasBoring">
-<ReturnType>%Integer</ReturnType>
+<Method name="GeefBeslagPosities">
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	Set BeslagPosities = ##class(%ListOfDataTypes).%New()
+	Set EersteBeslagParameter = ..GeefParameter(##class(BL.Flow.Offerte.enu.KADEDI.Key).C())
+	If ($IsObject(EersteBeslagParameter)){
+		Do BeslagPosities.Insert(EersteBeslagParameter.Value)	
+		Set BeslagPosities = ..VoegToeBeslagPositie(BeslagPosities,##class(BL.Flow.Offerte.enu.KADEDI.Key).D())
+		Set BeslagPosities = ..VoegToeBeslagPositie(BeslagPosities,##class(BL.Flow.Offerte.enu.KADEDI.Key).F())
+		Set BeslagPosities = ..VoegToeBeslagPositie(BeslagPosities,##class(BL.Flow.Offerte.enu.KADEDI.Key).G())
+		Set BeslagPosities = ..VoegToeBeslagPositie(BeslagPosities,##class(BL.Flow.Offerte.enu.KADEDI.Key).H())
+	
+	}
+	Quit BeslagPosities
+]]></Implementation>
 </Method>
 
-<Method name="GeefAantalProfiel1">
-<ReturnType>%Integer</ReturnType>
-</Method>
-
-<Method name="GeefAantalProfiel2">
-<ReturnType>%Integer</ReturnType>
-</Method>
-
-<Method name="GeefAantalProfiel3">
-<ReturnType>%Integer</ReturnType>
-</Method>
-
-<Method name="GeefAantalProfiel4">
-<ReturnType>%Integer</ReturnType>
-</Method>
-
 <Method name="GeefVulling">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set GlasCode = ..GeefParameter(##class(BL.Flow.Offerte.enu.KADEDI.Key).GlasCode()).Value
-	Quit ..GlasKleurMapping(GlasCode)
+	Quit ..GlasKleurMapping.GetAt(GlasCode)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefVullingExtra">
-<ReturnType>%String</ReturnType>
+<Method name="GeefVullingExtras">
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	Set VullingExtras = ##class(%ListOfDataTypes).%New()
+	If (..IsTrue(..GeefParameter(##class(BL.Flow.Offerte.enu.KADEDI.Key).HeeftGehardGlas()).Value)){
+		Do VullingExtras.Insert("HARD")		
+	}
+	Quit VullingExtras
+]]></Implementation>
 </Method>
 
 <Method name="IsGemonteerd">
@@ -174,14 +186,93 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefBoringen">
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[
+	Set Boringen = ##class(%ListOfObjects).%New()
+	
+	Set Boring1 = ..GeefGreepBoringVanInput(..GeefParameter(##class(BL.Flow.Offerte.enu.KADEDI.Key).K1()),..GeefParameter(##class(BL.Flow.Offerte.enu.KADEDI.Key).L1()))
+	Set Boring2 = ..GeefGreepBoringVanInput(..GeefParameter(##class(BL.Flow.Offerte.enu.KADEDI.Key).K2()),..GeefParameter(##class(BL.Flow.Offerte.enu.KADEDI.Key).L2()))
+	Set AfstandZijkant = ..GeefParameter(##class(BL.Flow.Offerte.enu.KADEDI.Key).O())
+	Set AfstandBovenkant = ..GeefParameter(##class(BL.Flow.Offerte.enu.KADEDI.Key).P())
+	Set Diameter = ..GeefParameter(##class(BL.Flow.Offerte.enu.KADEDI.Key).Q())
+	Set Boring3 = ..GeefDemperBoringVanInput(AfstandZijkant,AfstandBovenkant,Diameter,"BOVEN")
+	Set Boring4 = ..GeefDemperBoringVanInput(AfstandZijkant,AfstandBovenkant,Diameter,"ONDER")
+	
+	Do Boringen.Insert(Boring1)   ; if boring exists ... 
+	Do Boringen.Insert(Boring2)
+	Do Boringen.Insert(Boring3)
+	Do Boringen.Insert(Boring4)
+	
+	Quit Boringen
+]]></Implementation>
+</Method>
+
+<Method name="GeefGreepBoringVanInput">
+<FormalSpec>K:%Integer,L:%Integer</FormalSpec>
+<Private>1</Private>
+<ReturnType>BL.Flow.Offerte.dto.KADEDI.Boring</ReturnType>
+<Implementation><![CDATA[
+	Set Boring = ##class(BL.Flow.Offerte.dto.KADEDI.Boring).%New()
+	Set Boring.XPos = L
+	Set Boring.YPos = K
+	If ..GeefOphangPlaats() = ##class(DOM.PM.enu.KADOphangplaats).Links()
+	{
+		Set Boring.XPos = ..GeefBreedte()-L
+	}
+	
+	If (..GeefParameter(##class(BL.Flow.Offerte.enu.KADEDI.Key).M())="M4"){
+		Set Boring.BoorDiameter = 5		
+		Set Boring.BoorGlasDiameter = 7
+	}
+	
+	Set Perfo = ..GeefParameter(##class(BL.Flow.Offerte.enu.KADEDI.Key).Perfo())
+	If (Perfo="PB"){
+		Set Boring.IsDoorBoring = 1
+		Set Boring.IsPuntBoring = 0
+	}ElseIf(Pefro="SGK"){
+		Set Boring.IsDoorBoring = 0
+		Set Boring.IsPuntBoring = 1
+	}Else{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Kan geen borigen toevoegen want type '"_Perfo_"' laat dit niet toe."))
+	}
+	
+	Quit Boring
+]]></Implementation>
+</Method>
+
+<Method name="GeefDemperBoringVanInput">
+<FormalSpec>AfstandZijkant:%Integer,AfstandBovenkant:%Integer,Diameter:%Integer,Plaats:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set Boring = ##class(BL.Flow.Offerte.dto.KADEDI.Boring).%New()
+	Set Boring.XPos = AfstandZijkant
+	Set Boring.YPos = AfstandBovenkant
+	Set Boring.BoorDiameter = Diameter
+	Set Boring.IsDoorBoring = 0
+	Set Boring.IsPuntBoring = 0
+	
+	If (Plaats = "ONDER"){
+		Set Boring.YPos = ..GeefHoogte()-AfstandBovenkant	
+	}
+	
+	If ..GeefOphangPlaats() = ##class(DOM.PM.enu.KADOphangplaats).Links()
+	{
+		Set Boring.XPos = ..GeefBreedte()-AfstandZijkant
+	}
+	
+	Quit Boring
+]]></Implementation>
+</Method>
+
 <Method name="GeefParameter">
 <FormalSpec>ParameterNaam:BL.Flow.Offerte.enu.KADEDI.Key</FormalSpec>
 <Private>1</Private>
 <ReturnType>BL.Flow.Offerte.dto.KADEDI.Parameter</ReturnType>
 <Implementation><![CDATA[
 	Set ReturnParameter = ""
 	Set ParameterIt = ##class(TECH.ListIterator).%New(..Parameters)
-	While ('IsObject(ReturnParameter) && ParameterIt.HasNext()){
+	While ('$IsObject(ReturnParameter) && ParameterIt.HasNext()){
 		Set Parameter = ParameterIt.Next()
 		If (Parameter.Key = ParameterNaam){
 			Set ReturnParameter = Parameter	
@@ -195,9 +286,39 @@
 <FormalSpec>Waarde:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ($$$UCase(Waarde) = $$$UCase("TRUE"))
+<Implementation><![CDATA[	Quit ##class(%Boolean).XSDToLogical($$$LCase(Waarde))
 ]]></Implementation>
 </Method>
+
+<Method name="GeefBeslagParameters">
+<Private>1</Private>
+<ReturnType>%ListOfObjects</ReturnType>
+<Implementation><![CDATA[
+	Set BeslagParameters = ##class(%ListOfObjects).%New()
+	For Letter = "C","D","E","F","G","H" {
+		Set BeslagLabel = $CLASSMETHOD("BL.Flow.Offerte.enu.KADEDI.Key",Letter)
+		Set Parameter = ..GeefParameter(BeslagLabel)
+		If $IsObject(Parameter) {
+			Do BeslagParameters.Insert(Parameter)
+		}
+	}
+	Quit BeslagParameters
+]]></Implementation>
+</Method>
+
+<Method name="VoegToeBeslagPositie">
+<FormalSpec>BeslagPosities:%ListOfDataTypes,BeslagLabel:BL.Flow.Offerte.enu.KADEDI.Key</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ListOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	Set BeslagParameter = ..GeefParameter(BeslagLabel)
+	If ($IsObject(BeslagParameter)){
+		Set Positie = BeslagPosities.GetAt(BeslagPosities.Count())+BeslagParameter.Value
+		Do BeslagPosities.Insert(Positie)	
+	}
+	Quit BeslagPosities
+]]></Implementation>
+</Method>
 </Class>