Index: Prod/Kenmerk/DataDefinitie.cls.xml
===================================================================
diff -u -r54602 -r65542
--- Prod/Kenmerk/DataDefinitie.cls.xml	(.../DataDefinitie.cls.xml)	(revision 54602)
+++ Prod/Kenmerk/DataDefinitie.cls.xml	(.../DataDefinitie.cls.xml)	(revision 65542)
@@ -170,9 +170,36 @@
 
 <Method name="%OnAfterSave">
 <FormalSpec>IsNew:%Library.Boolean=1</FormalSpec>
-<ProcedureBlock>0</ProcedureBlock>
+<ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Library.Status</ReturnType>
 <Implementation><![CDATA[
+	#dim SaveOK As %Status = $$$OK
+	
+	Try {
+		If ($$$ISOK(SaveOK)) {
+			Set SaveOK = ..OnAfterSaveRebuildDataIndex()
+		}
+		If ($$$ISOK(SaveOK)) {
+			Set SaveOK = ##super(IsNew)
+		}
+		If ($$$ISOK(SaveOK)) {
+			Set SaveOK = ..OnAfterSaveTriggerKenmerkModifiedEvent()
+		}
+	}
+	Catch {
+		#dim OnAfterSaveException As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		;Do ..LogErrorViaBackgroundProcess(OnAfterSaveException)
+		Set SaveOK = $$$ERROR($$$GeneralError,"Fout bij OnAfterSave van Prod.Kenmerk.DataDefinitie: "_OnAfterSaveException.GeefOmschrijving())
+	}
+	Quit SaveOK
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterSaveRebuildDataIndex">
+<Private>1</Private>
+<ProcedureBlock>0</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
  //DataIndex waarden verwijderen
  Do ##class(Prod.Kenmerk.DataIndex).DeleteWaarden(%this.Kenmerk.Groep.Code,%this.Kenmerk.Kenmerk,..UnID)   ; %this.ProductGetObjectId())
 
@@ -201,8 +228,16 @@
 	 Set Waarde=%this.Waarden.GetNext(.Key)
  }
 
- If SaveOK set SaveOK =  ##super(IsNew)
- 
+	Quit SaveOK
+]]></Implementation>
+</Method>
+
+<Method name="OnAfterSaveTriggerKenmerkModifiedEvent">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+ Set SaveOK=$$$OK
  If $$$ISOK(SaveOK) && (..IsEventRaiser)
  {
 	// Het heeft geen zin om op de modified flag van "..Waarden" te gaan controleren, deze zal altijd false zijn.
@@ -497,15 +532,15 @@
 w $$ListToPieces^vhLib(##class(Prod.Kenmerk.DataDefinitie).Get("TB",89973,"BasisType"),";")
 Returns $LB(), want Waarden is een "List of %String"</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>GroepID,UnID,Kenmerk</FormalSpec>
+<FormalSpec>GroepID:TECH.String,UnID:TECH.String,Kenmerk:TECH.String</FormalSpec>
 <ReturnType>%List</ReturnType>
 <Implementation><![CDATA[	Quit $LG($G(^Prod.Ken.DataDefinitieD(UnID,GroepID_"||"_Kenmerk)),1)
 ]]></Implementation>
 </Method>
 
 <Method name="GetFormule">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>GroepID,UnID,Kenmerk</FormalSpec>
+<FormalSpec>GroepID:TECH.String,UnID:TECH.String,Kenmerk:TECH.String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	Set oKenmerk=..%OpenId(UnID_"||"_GroepID_"||"_Kenmerk)
@@ -518,7 +553,7 @@
 <Description>
 Indien het kenmerk bestaat, wordt het verwijderd. </Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>GroepID,UnID,Kenmerk</FormalSpec>
+<FormalSpec>GroepID:TECH.String,UnID:TECH.String,Kenmerk:TECH.String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set sc=$$$OK
@@ -1027,15 +1062,15 @@
 
 <Method name="Next">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>KenmerkUnID</FormalSpec>
+<FormalSpec>KenmerkUnID:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	quit $order(^Prod.Ken.DataDefinitieD(KenmerkUnID))
 ]]></Implementation>
 </Method>
 
 <Method name="Previous">
 <ClassMethod>1</ClassMethod>
-<FormalSpec>KenmerkUnID</FormalSpec>
+<FormalSpec>KenmerkUnID:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	quit $order(^Prod.Ken.DataDefinitieD(KenmerkUnID),-1)
 ]]></Implementation>