Index: APPS/Halux/Machine/Kantenband/impl/PassageDefinitieRepository.cls.xml
===================================================================
diff -u -r29059 -r54703
--- APPS/Halux/Machine/Kantenband/impl/PassageDefinitieRepository.cls.xml	(.../PassageDefinitieRepository.cls.xml)	(revision 29059)
+++ APPS/Halux/Machine/Kantenband/impl/PassageDefinitieRepository.cls.xml	(.../PassageDefinitieRepository.cls.xml)	(revision 54703)
@@ -15,40 +15,46 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
+	Set ..QueryAPI = $$$Implementation(QueryAPI, ##class(TECH.Context).Instance().GeefQueryAPI())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="GeefPassageDefinities">
-<FormalSpec>Concept:DOM.PM.enu.TAORConcept,Decor:APPS.Halux.PPS.enu.TAORDecor,Rol:DOM.PM.Maatwerk.Calc.HF.enu.TAORRol,LadeHoogte:DOM.PM.enu.TAORLadeHoogte</FormalSpec>
+<FormalSpec>Concept:DOM.PM.enu.TAORConcept,PlaatAfwerking:DOM.PM.enu.TAORPlaatAfwerking,Rol:DOM.PM.Maatwerk.Calc.HF.enu.TAORRol,LadeHoogte:DOM.PM.enu.TAORLadeHoogte</FormalSpec>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
-	#dim PassageDefinities As %ListOfObjects = ..GeefLadeHoogteSpecifiekePassageDefinities(Concept,Decor,Rol,LadeHoogte)
-	if $$$Not(PassageDefinities.Size) set PassageDefinities = ..GeefAlgemenePassageDefinities(Concept,Decor,Rol)
-	quit PassageDefinities
+	#dim PassageDefinities As %ListOfObjects = ..GeefLadeHoogteSpecifiekePassageDefinities(Concept, PlaatAfwerking, Rol, LadeHoogte)
+	
+	If $$$Not(PassageDefinities.Size) {
+		Set PassageDefinities = ..GeefAlgemenePassageDefinities(Concept, PlaatAfwerking, Rol)
+	}
+	
+	Quit PassageDefinities
 ]]></Implementation>
 </Method>
 
 <Method name="GeefLadeHoogteSpecifiekePassageDefinities">
-<FormalSpec>Concept:DOM.PM.enu.TAORConcept,Decor:APPS.Halux.PPS.enu.TAORDecor,Rol:DOM.PM.Maatwerk.Calc.HF.enu.TAORRol,LadeHoogte:DOM.PM.enu.TAORLadeHoogte</FormalSpec>
+<FormalSpec>Concept:DOM.PM.enu.TAORConcept,PlaatAfwerking:DOM.PM.enu.TAORPlaatAfwerking,Rol:DOM.PM.Maatwerk.Calc.HF.enu.TAORRol,LadeHoogte:DOM.PM.enu.TAORLadeHoogte</FormalSpec>
 <Private>1</Private>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
-	#dim Query As %String = "SELECT ID FROM APPS_Halux_Machine_Kantenband_data.PassageDefinitie WHERE Concept = ? AND Decor = ? AND Rol = ? And LadeHoogte = ?"
-	#dim Params As %List = $ListBuild(Concept, Decor, Rol,LadeHoogte)
-	quit ..GeefPassages(Query,Params)
+	#dim Query As %String = "SELECT ID FROM APPS_Halux_Machine_Kantenband_data.PassageDefinitie WHERE Concept = ? AND PlaatAfwerking = ? AND Rol = ? And LadeHoogte = ?"
+	#dim Params As %List = $ListBuild(Concept, PlaatAfwerking, Rol, LadeHoogte)
+	
+	Quit ..GeefPassages(Query,Params)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAlgemenePassageDefinities">
-<FormalSpec>Concept:DOM.PM.enu.TAORConcept,Decor:APPS.Halux.PPS.enu.TAORDecor,Rol:DOM.PM.Maatwerk.Calc.HF.enu.TAORRol</FormalSpec>
+<FormalSpec>Concept:DOM.PM.enu.TAORConcept,PlaatAfwerking:DOM.PM.enu.TAORPlaatAfwerking,Rol:DOM.PM.Maatwerk.Calc.HF.enu.TAORRol</FormalSpec>
 <Private>1</Private>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
-	#dim Query As %String = "SELECT ID FROM APPS_Halux_Machine_Kantenband_data.PassageDefinitie WHERE Concept = ? AND Decor = ? AND Rol = ? And LadeHoogte is null"
-	#dim Params As %List = $ListBuild(Concept, Decor, Rol)
-	quit ..GeefPassages(Query,Params)
+	#dim Query As %String = "SELECT ID FROM APPS_Halux_Machine_Kantenband_data.PassageDefinitie WHERE Concept = ? AND PlaatAfwerking = ? AND Rol = ? And LadeHoogte is null"
+	#dim Params As %List = $ListBuild(Concept, PlaatAfwerking, Rol)
+	
+	Quit ..GeefPassages(Query, Params)
 ]]></Implementation>
 </Method>
 
@@ -57,11 +63,13 @@
 <Private>1</Private>
 <ReturnType>%ListOfObjects</ReturnType>
 <Implementation><![CDATA[
-	set PassageDefinities = ##class(%ListOfObjects).%New()
+	#dim PassageDefinities As %ListOfObjects = ##class(%ListOfObjects).%New()
 	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetDynamicResultSet(Query, Params)
-	while ResultSet.Next() {
+	
+	While ResultSet.Next() {
 		Do PassageDefinities.Insert(##class(APPS.Halux.Machine.Kantenband.data.PassageDefinitie).OpenId(ResultSet.GetDataByName("ID")))
 	}
+	
 	Quit PassageDefinities
 ]]></Implementation>
 </Method>