Index: PRKENMERK.mac.rou =================================================================== diff -u -r29059 -r57350 --- PRKENMERK.mac.rou (.../PRKENMERK.mac.rou) (revision 29059) +++ PRKENMERK.mac.rou (.../PRKENMERK.mac.rou) (revision 57350) @@ -108,29 +108,24 @@ While (PropertiesIterator.HasNext()) { Set Property = PropertiesIterator.Next() - If ('Property.Private) && (Property.Origin '= "DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken") && (Property.Origin '[ "%") - { - Set PropertyClass = ##class(%Dictionary.CompiledClass).%OpenId(Property.Type) - Set PropertyWaarde = $zobjproperty(IngegevenKenmerken,Property.Name) - - If (PropertyClass.ClassType '= "datatype") && (PropertyClass.Super [ "DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken") && (PropertyWaarde '= "") - { - Do TeVerwerken.Insert(PropertyWaarde) - } - ElseIf (PropertyClass.ClassType = "datatype") - { - If (Property.Type = "%Library.Boolean") - { - Set PropertyWaarde = $S(PropertyWaarde:"Ja",1:"Nee") - Set Kenmerk(i) = "1\\"_Property.Name_"\"_PropertyWaarde - } - Else - { - Set Kenmerk(i) = "1\\"_Property.Name_"\"_$zobjclassmethod(Property.Type,"LogicalToDisplay",PropertyWaarde) - } - Set i = i + 1 - } - } + If ('Property.Private) && (Property.Origin '= "DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken") && (Property.Origin '[ "%") { + Set PropertyClass = ##class(%Dictionary.CompiledClass).%OpenId(Property.Type) + Set PropertyWaarde = $zobjproperty(IngegevenKenmerken,Property.Name) + + If (PropertyClass.ClassType = "datatype") { + If (Property.Type = "%Library.Boolean") { + Set PropertyWaarde = $S(PropertyWaarde:"Ja",1:"Nee") + Set Kenmerk(i) = "1\\"_Property.Name_"\"_PropertyWaarde + } + Else { + Set Kenmerk(i) = "1\\"_Property.Name_"\"_$zobjclassmethod(Property.Type,"LogicalToDisplay",PropertyWaarde) + } + Set i = i + 1 + } + ElseIf (PropertyClass.Super [ "DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken") && (PropertyWaarde '= "") { + Do TeVerwerken.Insert(PropertyWaarde) + } + } } Set Iterator = ##class(TECH.ListIterator).%New(TeVerwerken) While (Iterator.HasNext())