Index: APPS/Halux/Planning/impl/EventCatcher.cls.xml
===================================================================
diff -u -r946 -r954
--- APPS/Halux/Planning/impl/EventCatcher.cls.xml	(.../EventCatcher.cls.xml)	(revision 946)
+++ APPS/Halux/Planning/impl/EventCatcher.cls.xml	(.../EventCatcher.cls.xml)	(revision 954)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-22 15:17:36">
+<Export generator="Cache" version="9" zv="Cache for Windows NT (Intel/P4) 5.0.21 (Build 6408)" ts="2011-03-25 10:01:07">
 <Class name="APPS.Halux.Planning.impl.EventCatcher">
 <ProcedureBlock>1</ProcedureBlock>
 <Super>%RegisteredObject</Super>
-<TimeChanged>62172,55140.1952</TimeChanged>
+<TimeChanged>62175,36153.948292</TimeChanged>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Method name="InitSubscriptions">
@@ -28,14 +28,9 @@
 	If (Toelevering.GeefLeverancierNummer() = 6332) // Halux
 	{
 		Set Calculator = ##class(APPS.Halux.Planning.impl.ResourceGebruikCalculator).%New(Toelevering)
-		Set PlanningDataItems = Calculator.BerekenPlanningDataItems()
-		Set Iterator = ##class(TECH.ListIterator).%New(PlanningDataItems)
-		While (Iterator.HasNext())
-		{
-			Set PlanningDataItem = Iterator.Next()
-			Set Status = PlanningDataItem.%Save()
-			If ($$$ISERR(Status)) { Do ##class(vhLib.Logger).%New("Halux planningstool").Error("Aangemaakte toeleveringslijn kon niet gesaved worden!","Toelevering: "_Toelevering.GeefToeNr()_$c(10)_$c(13)_"Lijnnummer: "_PlanningDataItem.ToeleveringsLijn_$c(10)_$c(13)_"Status: "_$$ParseStatus^vhLib(Status)) }
-		}
+		Set ToeleveringInfo = Calculator.BerekenToeleveringInfo()
+		Set Status = ToeleveringInfo.%Save()
+		If ($$$ISERR(Status)) { Do ##class(vhLib.Logger).%New("Halux planningstool").Error("Aangemaakte ToeleveringInfo object kon niet gesaved worden!","Toelevering: "_Toelevering.GeefToeNr()_$c(10)_$c(13)_"Status: "_$$ParseStatus^vhLib(Status)) }
 	}
 ]]></Implementation>
 </Method>
@@ -47,21 +42,10 @@
 	Set Toelevering = Event.Data.Toelevering
 	If (Toelevering.GeefLeverancierNummer() = 6332) // Halux
 	{
-		Set ToeleveringsNummer = Toelevering.GeefToeNr()
-		&SQL(SELECT Gepland INTO :Gepland FROM APPS_Halux_Planning_impl.PlanningDataItem WHERE ToeleveringsNummer = :ToeleveringsNummer)
-		&SQL(DELETE FROM APPS_Halux_Planning_impl.PlanningDataItem WHERE ToeleveringsNummer = :ToeleveringsNummer)
-		
 		Set Calculator = ##class(APPS.Halux.Planning.impl.ResourceGebruikCalculator).%New(Toelevering)
-		Set PlanningDataItems = Calculator.BerekenPlanningDataItems($Get(Gepland))
-		Set Iterator = ##class(TECH.ListIterator).%New(PlanningDataItems)
-		While (Iterator.HasNext())
-		{
-			Set PlanningDataItem = Iterator.Next()
-			Set Status = PlanningDataItem.%Save()
-			If ($$$ISERR(Status)) { 
-			 	Do ##class(vhLib.Logger).%New("Halux planningstool").Error("Gewijzigde toeleveringslijn kon niet gesaved worden!","Toelevering: "_Toelevering.GeefToeNr()_$c(10)_$c(13)_"Lijnnummer: "_PlanningDataItem.ToeleveringsLijn_$c(10)_$c(13)_"Status: "_$$ParseStatus^vhLib(Status)) 
-			}
-		}
+		Set ToeleveringInfo = Calculator.BerekenToeleveringInfo()
+		Set Status = ToeleveringInfo.%Save()
+		If ($$$ISERR(Status)) { Do ##class(vhLib.Logger).%New("Halux planningstool").Error("Gewijzigde ToeleveringInfo object kon niet gesaved worden!","Toelevering: "_Toelevering.GeefToeNr()_$c(10)_$c(13)_"Status: "_$$ParseStatus^vhLib(Status)) }
 	}
 ]]></Implementation>
 </Method>
@@ -71,10 +55,11 @@
 <FormalSpec>Event:TECH.Events.ToeleveringDeletedEvent</FormalSpec>
 <Implementation><![CDATA[
 	Set ToeleveringsNummer = Event.Data.ToeleveringNummer
-	&SQL(DELETE FROM APPS_Halux_Planning_impl.PlanningDataItem WHERE ToeleveringsNummer = :ToeleveringsNummer)
-	&SQL(DELETE FROM APPS_Halux_Planning_impl.ExplicietePlanning WHERE ToeleveringsNummer = :ToeleveringsNummer)
+	Do ##class(APPS.Halux.Planning.impl.ToeleveringInfo).%DeleteId(ToeleveringsNummer)
+	//&SQL(DELETE FROM APPS_Halux_Planning_impl.PlanningDataItem WHERE ToeleveringsNummer = :ToeleveringsNummer)
+	//&SQL(DELETE FROM APPS_Halux_Planning_impl.ExplicietePlanning WHERE ToeleveringsNummer = :ToeleveringsNummer)
 ]]></Implementation>
 </Method>
 </Class>
-<Checksum value="1841201560"/>
+<Checksum value="4149618244"/>
 </Export>