Index: APPS/Halux/PPS/impl/AansturingActie/common/KlantEtiket/Template.cls.xml =================================================================== diff -u -r30528 -r30529 --- APPS/Halux/PPS/impl/AansturingActie/common/KlantEtiket/Template.cls.xml (.../Template.cls.xml) (revision 30528) +++ APPS/Halux/PPS/impl/AansturingActie/common/KlantEtiket/Template.cls.xml (.../Template.cls.xml) (revision 30529) @@ -135,20 +135,22 @@ #dim EtiketDataMetTussenEtiketTrigger As APPS.Halux.PPS.impl.AansturingActie.common.KlantEtiket.EtiketDataMetTussenEtiketTrigger = ..Etiketten.GetAt(i) #dim TriggerKeyList As %ListOfDataTypes = EtiketDataMetTussenEtiketTrigger.TussenEtiketTriggerKeyList if ##class(TECH.ListUtils).ListToPieces(VorigTriggerKeyList) '= ##class(TECH.ListUtils).ListToPieces(TriggerKeyList) { - #dim DisplayKeys As %ListOfDataTypes = ##class(%ListOfDataTypes).%New() - Set VorigTriggerKeyListIt = ##class(TECH.ListIterator).%New(VorigTriggerKeyList) - Set TriggerKeyListIt = ##class(TECH.ListIterator).%New(TriggerKeyList) - While VorigTriggerKeyListIt.HasNext() && TriggerKeyListIt.HasNext() { - #dim VorigTriggerKey As TECH.String = VorigTriggerKeyListIt.Next() - #dim TriggerKey As TECH.String = TriggerKeyListIt.Next() - If VorigTriggerKey '= TriggerKey { - Do DisplayKeys.Insert(TriggerKey) + #dim DisplayKeys As %ListOfDataTypes + If VorigTriggerKeyList.Count() '= TriggerKeyList.Count() { + Set DisplayKeys = EtiketDataMetTussenEtiketTrigger.TussenEtiketTriggerKeyList + } Else { + Set DisplayKeys = ##class(%ListOfDataTypes).%New() + Set VorigTriggerKeyListIt = ##class(TECH.ListIterator).%New(VorigTriggerKeyList) + Set TriggerKeyListIt = ##class(TECH.ListIterator).%New(TriggerKeyList) + While VorigTriggerKeyListIt.HasNext() && TriggerKeyListIt.HasNext() { + #dim VorigTriggerKey As TECH.String = VorigTriggerKeyListIt.Next() + #dim TriggerKey As TECH.String = TriggerKeyListIt.Next() + If VorigTriggerKey '= TriggerKey { + Do DisplayKeys.Insert(TriggerKey) + } } } - If $$$Not(VorigTriggerKeyListIt.HasNext() || TriggerKeyListIt.HasNext()) { - Set EtiketDataMetTussenEtiketTrigger.TussenEtiketTriggerKeyList = DisplayKeys - } - #dim Info As TECH.String = ##class(TECH.ListUtils).ListToPieces(EtiketDataMetTussenEtiketTrigger.TussenEtiketTriggerKeyList, ", ") + #dim Info As TECH.String = ##class(TECH.ListUtils).ListToPieces(DisplayKeys, ", ") #dim Layout As TECH.String = EtiketDataMetTussenEtiketTrigger.Etiket.Layout #dim Device As TECH.String = EtiketDataMetTussenEtiketTrigger.Etiket.Device Do ..Etiketten.InsertAt(..GeefTussenEtiketData(Info, Layout, Device), i)