Index: ECON/PM/Maatwerk/dto/RvgKenmerken.cls.xml
===================================================================
diff -u
--- ECON/PM/Maatwerk/dto/RvgKenmerken.cls.xml	(revision 0)
+++ ECON/PM/Maatwerk/dto/RvgKenmerken.cls.xml	(revision 68549)
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="ECON.PM.Maatwerk.dto.RvgKenmerken">
+<Super>ECON.PM.Maatwerk.dto.EconConfiguratieKenmerken</Super>
+<DependsOn>ECONimpl.PM.Maatwerk.EconConfiguratieKeysBuilder</DependsOn>
+
+<Property name="BinnencorpusbreedteInDeToepassing">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Binnencorpusbreedteindetoepassing"/>
+</Property>
+
+<Property name="BinnencorpusdiepteInDeToepassing">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Binnencorpusdiepteindetoepassing"/>
+</Property>
+
+<Property name="BinnencorpushoogteInDeToepassing">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Binnencorpushoogteindetoepassing"/>
+</Property>
+
+<Property name="ContactSchakelaarHouderInbegrepen">
+<Type>ECON.Boolean</Type>
+<Parameter name="XMLNAME" value="Contactschakelaarhouderinbegrepen"/>
+</Property>
+
+<Property name="CorpusConstructie">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Corpusconstructie"/>
+</Property>
+
+<Property name="DeurOndersteuning">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Deurondersteuning"/>
+</Property>
+
+<Property name="DeurSteunNaarBinnen">
+<Type>ECON.Boolean</Type>
+<Parameter name="XMLNAME" value="Deursteunnaarbinnen"/>
+</Property>
+
+<Property name="DikteGeleiderAfdekking">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Diktegeleiderafdekking"/>
+</Property>
+
+<Property name="DikteTussenplank">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Diktetussenplank"/>
+</Property>
+
+<Property name="FrontBreedte">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Frontbreedte"/>
+</Property>
+
+<Property name="FrontBreedteLinks">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Frontbreedtelinks"/>
+</Property>
+
+<Property name="FrontBreedteRechts">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Frontbreedterechts"/>
+</Property>
+
+<Property name="FrontDikte">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Frontdikte"/>
+</Property>
+
+<Property name="FrontHoogte">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Fronthoogte"/>
+</Property>
+
+<Property name="FrontOverstand">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Frontoverstand"/>
+</Property>
+
+<Property name="FrontOverstandLinks">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Frontoverstandlinks"/>
+</Property>
+
+<Property name="FrontOverstandRechts">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Frontoverstandrechts"/>
+</Property>
+
+<Property name="InbouwBreedte">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Inbouwbreedte"/>
+</Property>
+
+<Property name="InbouwDiepte">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Inbouwdiepte"/>
+</Property>
+
+<Property name="InbouwHoogte">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Inbouwhoogte"/>
+</Property>
+
+<Property name="InstelZijde">
+<Type>ECON.Boolean</Type>
+<Parameter name="XMLNAME" value="Instelzijde"/>
+</Property>
+
+<Property name="NominaleLengte">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Nominalelengte"/>
+</Property>
+
+<Property name="NominaleLengteLinks">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Nominalelengtelinks"/>
+</Property>
+
+<Property name="NominaleLengteRechts">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Nominalelengterechts"/>
+</Property>
+
+<Property name="PlanmatigeAanpak">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Planmatigeaanpak"/>
+</Property>
+
+<Property name="PocketAchterwandDikte">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Pocketachterwanddikte"/>
+</Property>
+
+<Property name="PocketDiepte">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Pocketdiepte"/>
+</Property>
+
+<Property name="PocketHoogte">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Pockethoogte"/>
+</Property>
+
+<Property name="PocketZijkantDikte">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Pocketzijkantdikte"/>
+</Property>
+
+<Property name="StukLijst">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Stuklijst"/>
+</Property>
+
+<Property name="TOBKleur">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Tobkleur"/>
+</Property>
+
+<Property name="Toepassing">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Toepassing"/>
+</Property>
+
+<Property name="VoegBoven">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Voegboven"/>
+</Property>
+
+<Property name="VoegOnder">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Voegonder"/>
+</Property>
+
+<Property name="VoegZijkant">
+<Type>ECON.String</Type>
+<Parameter name="XMLNAME" value="Voegzijkant"/>
+</Property>
+
+<Method name="FromArray">
+<CodeMode>objectgenerator</CodeMode>
+<FormalSpec>KenmerkenArray:%ArrayOfDataTypes</FormalSpec>
+<Implementation><![CDATA[
+	#dim Code,Key,Keys,Properties,Property,PropertyType
+
+	do ##class(ECONimpl.PM.Maatwerk.EconConfiguratieKeysBuilder).%New().BuildKeys(%class.Name,.Keys,"Data.Kenmerken.")	
+	do arrProperties^vhLib.Class(%class.Name,.Properties,"A","A","A",1)
+	
+	set (Property,Key)=""
+	for { set Property = $order(Properties(Property)) set Key = $order(Keys(Key)) quit:Property=""
+		set PropertyType = $LG( $G(Properties(Property)), 1)
+		set Code = $$subFromArrayGenerateKenmerkCode(Property, Key, PropertyType)
+		do %code.WriteLine($$$TAB_Code)
+	}
+	
+	do %code.WriteLine($$$TAB_"quit")
+
+	quit $$$OK
+
+subFromArrayGenerateKenmerkCode(Property, Key, PropertyType)
+	Set Code = ""
+	If (PropertyType = "ECON.Boolean") {
+		Set Code = "Set .."_Property_" = $ZCVT(KenmerkenArray.GetAt("""_Key_"""),""L"")"
+	} Else {
+		Set Code = "Set .."_Property_" = KenmerkenArray.GetAt("""_Key_""")"
+	}
+	Quit Code
+]]></Implementation>
+</Method>
+
+<Method name="ToArray">
+<CodeMode>objectgenerator</CodeMode>
+<ReturnType>%ArrayOfDataTypes</ReturnType>
+<Implementation><![CDATA[
+	#dim Code,Key,Keys,Properties,Property
+
+	do ##class(ECONimpl.PM.Maatwerk.EconConfiguratieKeysBuilder).%New().BuildKeys(%class.Name,.Keys,"Data.Kenmerken.")
+	do arrProperties^vhLib.Class(%class.Name,.Properties,"A","A","A",1)
+	
+	do %code.WriteLine($$$TAB_"set KenmerkenArray = ##class(%ArrayOfDataTypes).%New()")
+	
+	set (Property,Key)=""
+	for { set Property = $order(Properties(Property)) set Key = $order(Keys(Key)) quit:Property=""
+		set Code = "do:$length(.."_Property_") KenmerkenArray.SetAt(.."_Property_","""_Key_""")"
+		do %code.WriteLine($$$TAB_Code)
+	}
+	
+	do %code.WriteLine($$$TAB_"quit KenmerkenArray")
+
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<Data name="EconConfiguratieKenmerkenState">
+<Value name="1">
+<Value>Familie</Value>
+</Value>
+<Value name="2">
+<Value>Variant</Value>
+</Value>
+<Value name="3">
+<Value>BinnencorpusbreedteInDeToepassing</Value>
+</Value>
+<Value name="4">
+<Value>BinnencorpusdiepteInDeToepassing</Value>
+</Value>
+<Value name="5">
+<Value>BinnencorpushoogteInDeToepassing</Value>
+</Value>
+<Value name="6">
+<Value>ContactSchakelaarHouderInbegrepen</Value>
+</Value>
+<Value name="7">
+<Value>CorpusConstructie</Value>
+</Value>
+<Value name="8">
+<Value>DeurOndersteuning</Value>
+</Value>
+<Value name="9">
+<Value>DeurSteunNaarBinnen</Value>
+</Value>
+<Value name="10">
+<Value>DikteGeleiderAfdekking</Value>
+</Value>
+<Value name="11">
+<Value>DikteTussenplank</Value>
+</Value>
+<Value name="12">
+<Value>FrontBreedte</Value>
+</Value>
+<Value name="13">
+<Value>FrontBreedteLinks</Value>
+</Value>
+<Value name="14">
+<Value>FrontBreedteRechts</Value>
+</Value>
+<Value name="15">
+<Value>FrontDikte</Value>
+</Value>
+<Value name="16">
+<Value>FrontHoogte</Value>
+</Value>
+<Value name="17">
+<Value>FrontOverstand</Value>
+</Value>
+<Value name="18">
+<Value>FrontOverstandLinks</Value>
+</Value>
+<Value name="19">
+<Value>FrontOverstandRechts</Value>
+</Value>
+<Value name="20">
+<Value>InbouwBreedte</Value>
+</Value>
+<Value name="21">
+<Value>InbouwDiepte</Value>
+</Value>
+<Value name="22">
+<Value>InbouwHoogte</Value>
+</Value>
+<Value name="23">
+<Value>InstelZijde</Value>
+</Value>
+<Value name="24">
+<Value>NominaleLengte</Value>
+</Value>
+<Value name="25">
+<Value>NominaleLengteLinks</Value>
+</Value>
+<Value name="26">
+<Value>NominaleLengteRechts</Value>
+</Value>
+<Value name="27">
+<Value>PlanmatigeAanpak</Value>
+</Value>
+<Value name="28">
+<Value>PocketAchterwandDikte</Value>
+</Value>
+<Value name="29">
+<Value>PocketDiepte</Value>
+</Value>
+<Value name="30">
+<Value>PocketHoogte</Value>
+</Value>
+<Value name="31">
+<Value>PocketZijkantDikte</Value>
+</Value>
+<Value name="32">
+<Value>TOBKleur</Value>
+</Value>
+<Value name="33">
+<Value>Toepassing</Value>
+</Value>
+<Value name="34">
+<Value>VoegBoven</Value>
+</Value>
+<Value name="35">
+<Value>VoegOnder</Value>
+</Value>
+<Value name="36">
+<Value>VoegZijkant</Value>
+</Value>
+<Value name="37">
+<Value>StukLijst</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>
Index: ECONimpl/PM/Maatwerk/KenmerkenConverter/EconNaarApps/Rvg.cls.xml
===================================================================
diff -u
--- ECONimpl/PM/Maatwerk/KenmerkenConverter/EconNaarApps/Rvg.cls.xml	(revision 0)
+++ ECONimpl/PM/Maatwerk/KenmerkenConverter/EconNaarApps/Rvg.cls.xml	(revision 68549)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="ECONimpl.PM.Maatwerk.KenmerkenConverter.EconNaarApps.Rvg">
+<CompileAfter>ECON.PM.Maatwerk.dto.RvgKenmerken,APPS.PM.Maatwerk.dto.RVGKenmerken</CompileAfter>
+<Super>ECONimpl.PM.Maatwerk.KenmerkenConverter.EconNaarApps</Super>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Converteer">
+<FormalSpec>Kenmerken:ECON.PM.Maatwerk.dto.RvgKenmerken</FormalSpec>
+<ReturnType>APPS.PM.Maatwerk.dto.RVGKenmerken</ReturnType>
+<Implementation><![CDATA[
+	#dim RvgKenmerken As APPS.PM.Maatwerk.dto.RVGKenmerken = ..ConverteerGegenereerdeProperties(Kenmerken)
+		
+	Quit RvgKenmerken
+]]></Implementation>
+</Method>
+
+<Method name="ConverteerGegenereerdeProperties">
+<CodeMode>objectgenerator</CodeMode>
+<FormalSpec>Kenmerken:ECON.PM.Maatwerk.dto.RvgKenmerken</FormalSpec>
+<ReturnType>APPS.PM.Maatwerk.dto.RVGKenmerken</ReturnType>
+<Implementation><![CDATA[
+	#dim Properties
+	Do arrProperties^vhLib.Class("ECON.PM.Maatwerk.dto.RvgKenmerken",.Properties,"A","A","A",1)
+	
+	Do %code.WriteLine($$$TAB_"Set RvgKenmerken = ##class(APPS.PM.Maatwerk.dto.RVGKenmerken).%New()")
+	
+	#dim Property As %String = ""
+	For { set Property = $order(Properties(Property)) quit:Property=""
+		continue:##class(TECH.StringUtils).Equals(Property,"Familie","Variant")
+		continue:##class(TECH.StringUtils).Equals(Property,"Stuklijst")
+		
+		if $listget(Properties(Property),1)="ECON.Boolean" {
+			Do %code.WriteLine($$$TAB_"Set RvgKenmerken."_Property_" = $select(Kenmerken."_Property_"=""true"":""1"",1:""0"")")
+		} else { 
+			Do %code.WriteLine($$$TAB_"Set RvgKenmerken."_Property_" = Kenmerken."_Property)
+		}	
+	}
+	
+	Do %code.WriteLine($$$TAB_"Quit RvgKenmerken")
+
+	Quit $$$OK
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: ECONimpl/PM/Maatwerk/KenmerkenConverter/EconNaarAppsFactory.cls.xml
===================================================================
diff -u -r68023 -r68549
--- ECONimpl/PM/Maatwerk/KenmerkenConverter/EconNaarAppsFactory.cls.xml	(.../EconNaarAppsFactory.cls.xml)	(revision 68023)
+++ ECONimpl/PM/Maatwerk/KenmerkenConverter/EconNaarAppsFactory.cls.xml	(.../EconNaarAppsFactory.cls.xml)	(revision 68549)
@@ -19,8 +19,10 @@
 		Set EconNaarAppsConverter = ##class(ECONimpl.PM.Maatwerk.KenmerkenConverter.EconNaarApps.Mvx).%New()
 	} ElseIf (Kenmerken.Variant = "MAT_Standaard") {
 		Set EconNaarAppsConverter = ##class(ECONimpl.PM.Maatwerk.KenmerkenConverter.EconNaarApps.Mat).%New()
-	}ElseIf (Kenmerken.Variant = "TAX") {
+	} ElseIf (Kenmerken.Variant = "TAX") {
 		Set EconNaarAppsConverter = ##class(ECONimpl.PM.Maatwerk.KenmerkenConverter.EconNaarApps.Tax).%New()
+	} ElseIf (Kenmerken.Variant = "RVG") {
+		Set EconNaarAppsConverter = ##class(ECONimpl.PM.Maatwerk.KenmerkenConverter.EconNaarApps.Rvg).%New()
 	}
 	
 	Quit EconNaarAppsConverter