Index: BL/Flow/Offerte/dto/KADEDI/ProjectItem.cls.xml
===================================================================
diff -u -r3978 -r4005
--- BL/Flow/Offerte/dto/KADEDI/ProjectItem.cls.xml	(.../ProjectItem.cls.xml)	(revision 3978)
+++ BL/Flow/Offerte/dto/KADEDI/ProjectItem.cls.xml	(.../ProjectItem.cls.xml)	(revision 4005)
@@ -17,15 +17,18 @@
 
 <Property name="Project">
 <Type>BL.Flow.Offerte.dto.KADEDI.Project</Type>
+<Parameter name="XMLNAME" value="Projet"/>
 </Property>
 
 <Property name="Item">
 <Type>BL.Flow.Offerte.dto.KADEDI.Item</Type>
+<Parameter name="XMLNAME" value="Item"/>
 </Property>
 
 <Property name="Parameters">
 <Type>BL.Flow.Offerte.dto.KADEDI.Parameter</Type>
 <Collection>list</Collection>
+<Parameter name="XMLNAME" value="Parameters"/>
 </Property>
 </Class>
 
Index: BL/Flow/Offerte/dto/KADEDI/Boring.cls.xml
===================================================================
diff -u
--- BL/Flow/Offerte/dto/KADEDI/Boring.cls.xml	(revision 0)
+++ BL/Flow/Offerte/dto/KADEDI/Boring.cls.xml	(revision 4005)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="BL.Flow.Offerte.dto.KADEDI.Boring">
+<Super>%RegisteredObject</Super>
+
+<Property name="XPos">
+<Type>%Double</Type>
+</Property>
+
+<Property name="YPos">
+<Type>%Double</Type>
+</Property>
+
+<Property name="BoorDiameter">
+<Type>%Double</Type>
+</Property>
+
+<Property name="BoorGlasDiameter">
+<Type>%Double</Type>
+</Property>
+
+<Property name="IsDoorBoring">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="IsPuntBoring">
+<Type>%Boolean</Type>
+</Property>
+</Class>
+
+
+</Export>
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>
 
 
Index: BL/Flow/Offerte/IKADParameterWrapper.cls.xml
===================================================================
diff -u -r3978 -r4005
--- BL/Flow/Offerte/IKADParameterWrapper.cls.xml	(.../IKADParameterWrapper.cls.xml)	(revision 3978)
+++ BL/Flow/Offerte/IKADParameterWrapper.cls.xml	(.../IKADParameterWrapper.cls.xml)	(revision 4005)
@@ -24,7 +24,7 @@
 <ReturnType>DOM.PM.enu.KADProfielAfwerking</ReturnType>
 </Method>
 
-<Method name="GeefBeslag">
+<Method name="GeefBeslagID">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
 </Method>
@@ -39,34 +39,14 @@
 <ReturnType>%Integer</ReturnType>
 </Method>
 
-<Method name="GeefAantalProfiel1">
-<Abstract>1</Abstract>
-<ReturnType>%Integer</ReturnType>
-</Method>
-
-<Method name="GeefAantalProfiel2">
-<Abstract>1</Abstract>
-<ReturnType>%Integer</ReturnType>
-</Method>
-
-<Method name="GeefAantalProfiel3">
-<Abstract>1</Abstract>
-<ReturnType>%Integer</ReturnType>
-</Method>
-
-<Method name="GeefAantalProfiel4">
-<Abstract>1</Abstract>
-<ReturnType>%Integer</ReturnType>
-</Method>
-
 <Method name="GeefVulling">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
 </Method>
 
-<Method name="GeefVullingExtra">
+<Method name="GeefVullingExtras">
 <Abstract>1</Abstract>
-<ReturnType>%String</ReturnType>
+<ReturnType>%ListOfDataTypes</ReturnType>
 </Method>
 
 <Method name="IsGemonteerd">
@@ -83,6 +63,11 @@
 <Abstract>1</Abstract>
 <ReturnType>DOM.PM.enu.KADOphangplaats</ReturnType>
 </Method>
+
+<Method name="GeefBoringen">
+<Abstract>1</Abstract>
+<ReturnType>%ListOfObjects</ReturnType>
+</Method>
 </Class>
 
 
FishEye: Tag 4005 refers to a dead (removed) revision in file `BL/Flow/Offerte/dto/KADEDI/EDI.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: BL/Flow/Offerte/enu/KADEDI/Key.cls.xml
===================================================================
diff -u -r3978 -r4005
--- BL/Flow/Offerte/enu/KADEDI/Key.cls.xml	(.../Key.cls.xml)	(revision 3978)
+++ BL/Flow/Offerte/enu/KADEDI/Key.cls.xml	(.../Key.cls.xml)	(revision 4005)
@@ -41,14 +41,14 @@
 ]]></Implementation>
 </Method>
 
-<Method name="IsLinksdraaiend">
+<Method name="IsLinksDraaiend">
 <ClassMethod>1</ClassMethod>
 <ReturnType>BL.Flow.Offerte.enu.KADEDI.Key</ReturnType>
 <Implementation><![CDATA[	Quit "gauche"
 ]]></Implementation>
 </Method>
 
-<Method name="IsRechtsdraaiend">
+<Method name="IsRechtsDraaiend">
 <ClassMethod>1</ClassMethod>
 <ReturnType>BL.Flow.Offerte.enu.KADEDI.Key</ReturnType>
 <Implementation><![CDATA[	Quit "droit"
Index: Prod/GADef/KaderDeurFactory.cls.xml
===================================================================
diff -u
--- Prod/GADef/KaderDeurFactory.cls.xml	(revision 0)
+++ Prod/GADef/KaderDeurFactory.cls.xml	(revision 4005)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Prod.GADef.KaderDeurFactory">
+<Super>%RegisteredObject</Super>
+
+<Method name="Maak">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>dtoKD:Prod.GADef.dto.KaderDeur</FormalSpec>
+<ReturnType>Prod.GADef.KaderDeur</ReturnType>
+<Implementation><![CDATA[
+		Set KaderDeur = ##class(Prod.GADef.KaderDeur).%New()
+		Set VullingExtra = ##class(TECH.ListUtils).ListToPieces(dtoKD.VullingExtras,";")
+		Do KaderDeur.FillObjectViaParam(dtoKD.ProfType,dtoKD.Hoogte,dtoKD.Breedte,dtoKD.Beslag,dtoKD.QtyBeslag,dtoKD.QtyGlasBoor,dtoKD.QtyProfO,dtoKD.QtyProfB,dtoKD.QtyProfR,dtoKD.QtyProfL,dtoKD.Vulling,VullingExtra,dtoKD.IsGemonteerd,dtoKD.Verpakking,dtoKD.ProfKostSpec,dtoKD.VulKostSpec)
+		Quit KaderDeur
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: BL/Flow/Offerte/dto/KADEDI/Project.cls.xml
===================================================================
diff -u -r3978 -r4005
--- BL/Flow/Offerte/dto/KADEDI/Project.cls.xml	(.../Project.cls.xml)	(revision 3978)
+++ BL/Flow/Offerte/dto/KADEDI/Project.cls.xml	(.../Project.cls.xml)	(revision 4005)
@@ -4,7 +4,7 @@
 <Super>%RegisteredObject,%XML.Adaptor</Super>
 
 <Parameter name="XMLNAME">
-<Default>Project</Default>
+<Default>Projet</Default>
 </Parameter>
 
 <Parameter name="XMLIGNORENULL">
@@ -17,26 +17,32 @@
 
 <Property name="ProjectId">
 <Type>%Integer</Type>
+<Parameter name="XMLNAME" value="ProjectId"/>
 </Property>
 
 <Property name="ProjectName">
 <Type>%String</Type>
+<Parameter name="XMLNAME" value="ProjectName"/>
 </Property>
 
 <Property name="Customer">
 <Type>%String</Type>
+<Parameter name="XMLNAME" value="Customer"/>
 </Property>
 
 <Property name="CodeBarres">
 <Type>%String</Type>
+<Parameter name="XMLNAME" value="CodeBarres"/>
 </Property>
 
 <Property name="ProjectItemId">
 <Type>%Integer</Type>
+<Parameter name="XMLNAME" value="ProjectItemId"/>
 </Property>
 
 <Property name="ExportVersion">
 <Type>%String</Type>
+<Parameter name="XMLNAME" value="ExportVersion"/>
 </Property>
 </Class>
 
Index: BL/Flow/Offerte/Parser/beNEWSOBELWOOD.cls.xml
===================================================================
diff -u -r3972 -r4005
--- BL/Flow/Offerte/Parser/beNEWSOBELWOOD.cls.xml	(.../beNEWSOBELWOOD.cls.xml)	(revision 3972)
+++ BL/Flow/Offerte/Parser/beNEWSOBELWOOD.cls.xml	(.../beNEWSOBELWOOD.cls.xml)	(revision 4005)
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9">
+<Export generator="Cache" version="24">
 <Class name="BL.Flow.Offerte.Parser.beNEWSOBELWOOD">
+<ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>BL.Flow.Offerte.Parser.AbstractParserTXT</Super>
-<ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="pxOfferte">
 <Type>BL.Flow.Offerte.pxHoofding</Type>
+<Private>1</Private>
 </Property>
 
 <Method name="parse">
@@ -18,6 +19,7 @@
 
 <Method name="Import">
 <FormalSpec><![CDATA[&arOffertes]]></FormalSpec>
+<Private>1</Private>
 <ReturnType>ParseStatus</ReturnType>
 <Implementation><![CDATA[
 	Set Status=""
@@ -43,6 +45,7 @@
 
 <Method name="ImportFilesVanSubDir">
 <FormalSpec>SubDirFullPath:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	Set KlantNewSobelwood=""   ; ##class(DOM.DomeinContext).Instance().GeefKlantAPI().GeefKlantNewSobelwood()
 	Do ..InitOfferteHoofding(KlantNewSobelwood)
@@ -59,59 +62,82 @@
 
 <Method name="ImportFile">
 <FormalSpec>FileName:%String</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	write "ImportOneFile "_FileName,!
-	Set Projectdto=..GeefProjectdtoFromFile(FileName)
+	#dim KADWrapper as BL.Flow.Offerte.IKADWrapper
+	Set ProjectItem = ..GeefProjectItemFromFile(FileName)
+	Set KADWrapper = ##class(BL.Flow.Offerte.impl.KADWrapper).%New(ProjectItem)
 	
-	If $IsObject(Projectdto) {
-		Set pxLijn=..MaakOfferteLijn(Projectdto)
-		If $IsObject(pxLijn) {
-			Do ..pxOfferte.Lijnen.SetAt(pxLijn,..pxOfferte.Lijnen.Count()+1)
-		}
-	
-		// De hoofding-gegevens worden telkens opnieuw ingevuld, voor iedere lijn 
-		Do ..VulOfferteHoofding(Projectdto)
+	Set pxLijn=..MaakOfferteLijn(KADWrapper)
+	If $IsObject(pxLijn) {
+		Do ..pxOfferte.Lijnen.SetAt(pxLijn,..pxOfferte.Lijnen.Count()+1)
 	}
+	
+	// De hoofding-gegevens worden telkens opnieuw ingevuld, voor iedere lijn 
+	Do ..VulOfferteHoofding(KADWrapper)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefProjectdtoFromFile">
+<Method name="GeefProjectItemFromFile">
 <FormalSpec>FileName:%String</FormalSpec>
-<ReturnType>%RegisteredObject</ReturnType>
+<Private>1</Private>
+<ReturnType>BL.Flow.Offerte.dto.KADEDI.ProjectItem</ReturnType>
 <Implementation><![CDATA[
-	Set Projectdto=##class(BL.Flow.Offerte.pxLijn).%New()   ; FileName 
-	Quit Projectdto
+	Set ProjectItem = ""
+	Set XMLReader = ##class(%XML.Reader).%New()
+	Set Status = XMLReader.OpenFile(FileName)
+	If $$$ISERR(Status) { 
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Openen xml bestand New Sobelwoord niet gelukt",Status))
+	}
+	
+	Do XMLReader.Correlate("ProjectItem","BL.Flow.Offerte.dto.KADEDI.ProjectItem") 
+	Set Status =  XMLReader.Next(.ProjectItem,.sc)
+	If $$$ISERR(Status) {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"Correlate xml bestand New Sobelwoord niet gelukt",Status))
+	}
+	
+	If '$IsObject(ProjectItem) Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Kon geen ProjectItem teruggeven van bestand : '"_FileName_"'"))
+	
+	Quit ProjectItem
 ]]></Implementation>
 </Method>
 
 <Method name="InitOfferteHoofding">
-<FormalSpec>Klant</FormalSpec>
+<FormalSpec>Klant:DOM.CRM.Klant</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
 	Set ..pxOfferte = ##class(BL.Flow.Offerte.pxHoofding).%New()
 	Set ..pxOfferte.KlantID = 9365   ; Klant.GeefNummer()
-	;Set ..pxOfferte.OrderRef = aOrders(idxRef)        
-	;Set ..pxOfferte.OrderCommRef = $ZSTRIP(idxRef,"<>"," ")   
 	Set ..pxOfferte.OrderDatum = $TR($ZD($H,1),"/",".")
 	Set ..pxOfferte.DocDate = $TR($ZD($H,1),"/",".")
 ]]></Implementation>
 </Method>
 
 <Method name="VulOfferteHoofding">
-<FormalSpec>Projectdto:%RegisteredObject</FormalSpec>
+<FormalSpec>KADWrapper:BL.Flow.Offerte.IKADWrapper</FormalSpec>
+<Private>1</Private>
 <Implementation><![CDATA[
-	Set ..pxOfferte.OrderRef = "OrderRef X"           ; Projectdto.GeefOrderRef()
-	Set ..pxOfferte.OrderCommRef = "OrderCommRef X"   ; Projectdto.GeefOrderCommRef()
+	Set ..pxOfferte.OrderRef = KADWrapper.GeefKlant()_" - "_KADWrapper.GeefProjectNaam()
+	Set ..pxOfferte.OrderCommRef = ..pxOfferte.OrderRef
 ]]></Implementation>
 </Method>
 
 <Method name="MaakOfferteLijn">
-<FormalSpec>Projectdto:%RegisteredObject</FormalSpec>
+<FormalSpec>KADWrapper:BL.Flow.Offerte.IKADWrapper</FormalSpec>
+<Private>1</Private>
 <ReturnType>BL.Flow.Offerte.pxLijn</ReturnType>
 <Implementation><![CDATA[
 	Set pxLijn=##class(BL.Flow.Offerte.pxLijn).%New()
-	Set pxLijn.KlantProdRef="KlantProdRef X"   ; Projectdto.GeefKlantProdRef()
+	Set pxLijn.KlantProdRef = KADWrapper.GeefItemOmschrijving()
+	Set pxLijn.ProdRef = pxLijn.KlantProdRef
+	Set pxLijn.Aantal = KADWrapper.GeefItemAantal()
+	Set pxLijn.GrootteOrde = "E"
+	Set pxLijn.LijnType = "P"
 	Quit pxLijn
 ]]></Implementation>
 </Method>
 </Class>
+
+
 </Export>
Index: BL/Flow/Offerte/dto/KADEDI/Parameter.cls.xml
===================================================================
diff -u -r3978 -r4005
--- BL/Flow/Offerte/dto/KADEDI/Parameter.cls.xml	(.../Parameter.cls.xml)	(revision 3978)
+++ BL/Flow/Offerte/dto/KADEDI/Parameter.cls.xml	(.../Parameter.cls.xml)	(revision 4005)
@@ -17,10 +17,12 @@
 
 <Property name="Key">
 <Type>BL.Flow.Offerte.enu.KADEDI.Key</Type>
+<Parameter name="XMLNAME" value="Key"/>
 </Property>
 
 <Property name="Value">
 <Type>%String</Type>
+<Parameter name="XMLNAME" value="Value"/>
 </Property>
 </Class>
 
Index: Prod/GADef/KaderDeur.cls.xml
===================================================================
diff -u -r3979 -r4005
--- Prod/GADef/KaderDeur.cls.xml	(.../KaderDeur.cls.xml)	(revision 3979)
+++ Prod/GADef/KaderDeur.cls.xml	(.../KaderDeur.cls.xml)	(revision 4005)
@@ -770,7 +770,8 @@
 <Description>
 Cratie van een kaderdeur door het ingeven van de parameters nodig voor de prijsberekening.
 Deze prijsberekening kan dan gebruikt worden voor prijslijsten aan te maken in bv. Excel
-ProfType : ProfielType-ProfielAfwerking ("PSV-EV")</Description>
+ProfType : ProfielType-ProfielAfwerking ("PSV-EV")
+Mogelijke waarden parameters (zie excel file KAD.Res.PIItems)</Description>
 <FormalSpec>ProfType:%Library.String,Hoogte:%Library.Integer,Breedte:%Library.Integer,Beslag:%Library.String,QtyBeslag:%Library.Integer,QtyGlasBoor:%Library.Integer,QtyProfO:%Library.String,QtyProfB:%Library.String,QtyProfR:%Library.String,QtyProfL:%Library.String,Vulling:%Library.String,VullingExtra:%Library.String="",IsGemonteerd:%Library.Boolean,Verpakking:%Library.String,ProfKostSpec:%Library.Float="",VulKostSpec:%Library.Float=""</FormalSpec>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
Index: BL/Flow/Offerte/impl/KADWrapper.cls.xml
===================================================================
diff -u -r3994 -r4005
--- BL/Flow/Offerte/impl/KADWrapper.cls.xml	(.../KADWrapper.cls.xml)	(revision 3994)
+++ BL/Flow/Offerte/impl/KADWrapper.cls.xml	(.../KADWrapper.cls.xml)	(revision 4005)
@@ -9,6 +9,7 @@
 
 <Property name="ProjectItem">
 <Type>BL.Flow.Offerte.dto.KADEDI.ProjectItem</Type>
+<Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
@@ -31,13 +32,13 @@
 
 <Method name="GeefProjectNaam">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..ProjectItem.Project.ProjectName
+<Implementation><![CDATA[	Quit $$$Trim(..ProjectItem.Project.ProjectName)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefKlant">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..ProjectItem.Project.Customer
+<Implementation><![CDATA[	Quit $$$Trim(..ProjectItem.Project.Customer)
 ]]></Implementation>
 </Method>
 
@@ -80,18 +81,33 @@
 <Method name="GeefKaderDeur">
 <ReturnType>Prod.GADef.KaderDeur</ReturnType>
 <Implementation><![CDATA[
-	Set KaderDeur = ##class(Prod.GADef.KaderDeur).%New()
 	
 	Set KADP = ..GeefParameterWrapper()
-	Set Profiel = KADP.GeefProfielType()_"-"_KADP.GeefProfielAfwerking()
-	Do KaderDeur.FillObjectViaParam(Profiel,KADP.GeefHoogte(),KADP.GeefBreedte(),KADP.GeefBeslag(),KADP.GeefAantalBeslag(),"QtyGlasBoor","QtyProfO","QtyProfB","QtyProfR","QtyProfL",KADP.GeefVulling(),KADP.GeefVullingExtra(),KADP.IsGemonteerd(),KADP.GeefVerpakking())
 	
-	Quit KaderDeur
+	Set dtoKaderDeur = ##class(Prod.GADef.dto.KaderDeur).%New()
+	Set dtoKaderDeur.Beslag = KADP.GeefBeslagID()
+	Set dtoKaderDeur.Breedte = KADP.GeefBreedte()
+	Set dtoKaderDeur.Hoogte = KADP.GeefHoogte()
+	Set dtoKaderDeur.IsGemonteerd = KADP.IsGemonteerd()
+	Set dtoKaderDeur.ProfType = KADP.GeefProfielType()_"-"_KADP.GeefProfielAfwerking()
+	Set dtoKaderDeur.QtyBeslag = KADP.GeefAantalBeslag()
+	Set dtoKaderDeur.Verpakking = KADP.GeefVerpakking()
+	Set dtoKaderDeur.Vulling = KADP.GeefVulling()
+	Set dtoKaderDeur.VullingExtras = KADP.GeefVullingExtras()
+	
+	Set KaderDeur = ##class(Prod.GADef.KaderDeurFactory).Maak(dtoKaderDeur)
+	
+	/// Boringen toevoegen
 ]]></Implementation>
 </Method>
 
+<Method name="VoegToeBoring">
+<FormalSpec>KaderDeur:Prod.GADef.KaderDeur</FormalSpec>
+<Implementation><![CDATA[	// TO DO  (of ergens anders)   ;-)
+]]></Implementation>
+</Method>
+
 <Method name="GeefParameterWrapper">
-<Private>1</Private>
 <ReturnType>BL.Flow.Offerte.IKADParameterWrapper</ReturnType>
 <Implementation><![CDATA[	Quit ##class(BL.Flow.Offerte.impl.KADParameterWrapper).%New(..ProjectItem.Parameters)
 ]]></Implementation>
Index: BL/Flow/Offerte/IKADWrapper.cls.xml
===================================================================
diff -u -r3978 -r4005
--- BL/Flow/Offerte/IKADWrapper.cls.xml	(.../IKADWrapper.cls.xml)	(revision 3978)
+++ BL/Flow/Offerte/IKADWrapper.cls.xml	(.../IKADWrapper.cls.xml)	(revision 4005)
@@ -2,6 +2,7 @@
 <Export generator="Cache" version="24">
 <Class name="BL.Flow.Offerte.IKADWrapper">
 <Abstract>1</Abstract>
+<IncludeCode>vhLib.Macro</IncludeCode>
 <Super>%RegisteredObject</Super>
 
 <Method name="GeefProjectId">
Index: Prod/GADef/dto/KaderDeur.cls.xml
===================================================================
diff -u
--- Prod/GADef/dto/KaderDeur.cls.xml	(revision 0)
+++ Prod/GADef/dto/KaderDeur.cls.xml	(revision 4005)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="Prod.GADef.dto.KaderDeur">
+<Super>%RegisteredObject</Super>
+
+<Property name="ProfType">
+<Type>%String</Type>
+</Property>
+
+<Property name="Hoogte">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="Breedte">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="Beslag">
+<Type>%String</Type>
+</Property>
+
+<Property name="QtyBeslag">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="QtyGlasBoor">
+<Type>%Integer</Type>
+</Property>
+
+<Property name="QtyProfO">
+<Type>%String</Type>
+</Property>
+
+<Property name="QtyProfB">
+<Type>%String</Type>
+</Property>
+
+<Property name="QtyProfR">
+<Type>%String</Type>
+</Property>
+
+<Property name="QtyProfL">
+<Type>%String</Type>
+</Property>
+
+<Property name="Vulling">
+<Type>%String</Type>
+</Property>
+
+<Property name="VullingExtras">
+<Type>%ListOfDataTypes</Type>
+</Property>
+
+<Property name="IsGemonteerd">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="Verpakking">
+<Type>%String</Type>
+</Property>
+
+<Property name="ProfKostSpec">
+<Type>%Float</Type>
+</Property>
+
+<Property name="VulKostSpec">
+<Type>%Float</Type>
+</Property>
+</Class>
+
+
+</Export>
Index: vhUnitTest/BL/Flow/Offerte/TestKADEDI.cls.xml
===================================================================
diff -u
--- vhUnitTest/BL/Flow/Offerte/TestKADEDI.cls.xml	(revision 0)
+++ vhUnitTest/BL/Flow/Offerte/TestKADEDI.cls.xml	(revision 4005)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.BL.Flow.Offerte.TestKADEDI">
+<Description>
+Do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","BL.Flow.Offerte.TestKADEDI")</Description>
+<ClassType/>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="SetupXML">
+<ClassMethod>1</ClassMethod>
+<ReturnType>BL.Flow.Offerte.dto.KADEDI.ProjectItem</ReturnType>
+<Implementation><![CDATA[
+		Set TestBestand = ##class(TECH.Config.ConfigMgr).Instance().GetString("UnitTestRoot")
+		Set TestBestand = ##class(TECH.Files).AppendFile(TestBestand,"BL.Flow.Offerte")
+		Set TestBestand = ##class(TECH.Files).AppendFile(TestBestand,"KADEDI.xml")
+		
+		Set ProjectItem = ""
+		Set XMLReader = ##class(%XML.Reader).%New()
+		Set Status = XMLReader.OpenFile(TestBestand)
+		If $$$ISERR(Status) w "OpenStream Niet Gelukt ! "_$C(13,10)_$$ParseStatus^vhLib(Status)
+		
+		Do XMLReader.Correlate("ProjectItem","BL.Flow.Offerte.dto.KADEDI.ProjectItem") 
+		Set Status =  XMLReader.Next(.ProjectItem,.sc)
+		If $$$ISERR(Status) w "Correlate Niet Gelukt ! "_$C(13,10)_$$ParseStatus^vhLib(Status)
+		Quit ProjectItem
+]]></Implementation>
+</Method>
+
+<Method name="TestProject">
+<Implementation><![CDATA[
+		Set ProjectItem = ..SetupXML()
+		#dim KADWrapper As BL.Flow.Offerte.IKADWrapper
+		Set KADWrapper = ##class(BL.Flow.Offerte.impl.KADWrapper).%New(ProjectItem)
+		
+		Do $$$AssertEquals(KADWrapper.GeefKlant(),"Cantineau","Klant is correct.")
+		Do $$$AssertEquals(KADWrapper.GeefBarcode(),"1911112809155", "Klant barcode is correct.")
+		Do $$$AssertEquals(KADWrapper.GeefProjectNaam(),"dressing","Project naam is correct.")
+		Do $$$AssertEquals(KADWrapper.GeefProjectId(),"394","Project id is correct.")
+		Do $$$AssertEquals(KADWrapper.GeefProjectItemId(),"17507", "Project Item id is correct.")
+		Do $$$AssertEquals(KADWrapper.GeefExportVersie(),"1","Export versie is correct.")
+]]></Implementation>
+</Method>
+
+<Method name="TestItem">
+<Implementation><![CDATA[
+		Set ProjectItem = ..SetupXML()
+		#dim KADWrapper As BL.Flow.Offerte.IKADWrapper
+		Set KADWrapper = ##class(BL.Flow.Offerte.impl.KADWrapper).%New(ProjectItem)
+		
+		Do $$$AssertEquals(KADWrapper.GeefItemId(),"1124","Item id is correct.")
+		Do $$$AssertEquals(KADWrapper.GeefItemOmschrijving(),"Portes tournantes NL", "Item omschrijving is correct.")
+		Do $$$AssertEquals(KADWrapper.GeefItemAantal(),"1","Item aantal is correct.")
+]]></Implementation>
+</Method>
+
+<Method name="TestParameters">
+<Implementation><![CDATA[
+		Set ProjectItem = ..SetupXML()
+		
+		Set KADWrapper = ##class(BL.Flow.Offerte.impl.KADWrapper).%New(ProjectItem)
+		#dim ParameterWrapper As BL.Flow.Offerte.IParameterWrapper	
+		Set ParameterWrapper = KADWrapper.GeefParameterWrapper()
+		
+		Do $$$AssertEquals(ParameterWrapper.GeefHoogte(),"1678","Hoogte is correct.")		
+		Do $$$AssertEquals(ParameterWrapper.GeefBreedte(),"435","Breedte is correct.")		
+		Do $$$AssertTrue(ParameterWrapper.IsGemonteerd(),"Is gemonteerd is correct.")		
+		Do $$$AssertEquals(ParameterWrapper.GeefProfielType(),"PBG","Profiel type is correct.")		
+		Do $$$AssertEquals(ParameterWrapper.GeefProfielAfwerking(),"EV","Profiel afwerking is correct.")		
+		Do $$$AssertEquals(ParameterWrapper.GeefVulling(),"ALVULXA","Vulling is correct.")
+		Do $$$AssertEquals(ParameterWrapper.GeefAantalBeslag(),5,"AantalBeslag is correct.")
+		Do $$$AssertEquals(ParameterWrapper.GeefVerpakking(),##class(DOM.PM.enu.KADVerpakking).Krimp(),"Verpakking is correct.")
+		Do $$$AssertEquals(ParameterWrapper.GeefOphangPlaats(),##class(DOM.PM.enu.KADOphangplaats).Rechts(),"Ophangplaats is correct.")
+		Do $$$AssertEquals(ParameterWrapper.GeefBeslagID(),"BLUMS","BeslagID is correct.")
+		
+		Set BeslagPosities = ParameterWrapper.GeefBeslagPosities()
+		Do $$$AssertEquals(BeslagPosities.GetAt(1),"119","Eerste positie is correct.")
+		Do $$$AssertEquals(BeslagPosities.GetAt(2),"471","Tweede positie is correct.")
+		Do $$$AssertEquals(BeslagPosities.GetAt(3),"823","Derde positie is correct.")
+		Do $$$AssertEquals(BeslagPosities.GetAt(4),"1207","Vierde positie is correct.")
+		Do $$$AssertEquals(BeslagPosities.GetAt(5),"1559","Vijfde positie is correct.")
+]]></Implementation>
+</Method>
+
+<Method name="TestKaderDeur">
+<Implementation><![CDATA[
+		Set ProjectItem = ..SetupXML()
+		Set KADWrapper = ##class(BL.Flow.Offerte.impl.KADWrapper).%New(ProjectItem)
+		Set KaderDeur = KADWrapper.GeefKaderDeur()
+		Do $$$AssertTrue($IsObject(KaderDeur),"KaderDeur is een object")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>