Index: vhUnitTest/APPS/VisiDot/impl/BuildCapture.cls.xml
===================================================================
diff -u -r1717 -r1750
--- vhUnitTest/APPS/VisiDot/impl/BuildCapture.cls.xml	(.../BuildCapture.cls.xml)	(revision 1717)
+++ vhUnitTest/APPS/VisiDot/impl/BuildCapture.cls.xml	(.../BuildCapture.cls.xml)	(revision 1750)
@@ -41,6 +41,10 @@
 <Type>APPS.VisiDot.dto.CaptureInfo</Type>
 </Property>
 
+<Property name="CaptureHelper">
+<Type>APPS.VisiDot.impl.CaptureHelper</Type>
+</Property>
+
 <Property name="Sequence">
 <Type>APPS.VisiDot.dto.Sequence</Type>
 </Property>
@@ -61,6 +65,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Empty">
+<FormalSpec>VHossNr,Zijkant</FormalSpec>
+<Implementation><![CDATA[
+	Do ..BuildCapture()
+	Quit ..Capture
+]]></Implementation>
+</Method>
+
 <Method name="CorrectVHoss">
 <FormalSpec>VHossNr,Zijkant</FormalSpec>
 <Implementation><![CDATA[
@@ -103,6 +115,11 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ZetBatchID">
+<Implementation><![CDATA[	Do ..CaptureHelper.ZetDirectorSleutelWaarde("OrderID",..BatchID)
+]]></Implementation>
+</Method>
+
 <Method name="BuildCapture">
 <Private>1</Private>
 <Implementation><![CDATA[
@@ -113,6 +130,7 @@
 	Do VRRead.Reader.Insert(Reader)
 	Set ..Sequence=##class(APPS.VisiDot.dto.Sequence).%New()
 	Do Reader.Sequence.Insert(..Sequence)
+	Set ..CaptureHelper=##class(APPS.VisiDot.impl.VHossCaptureHelper).%New(..Capture)
 ]]></Implementation>
 </Method>
 
@@ -148,7 +166,9 @@
 	Set Detection=##class(APPS.VisiDot.dto.Detection).%New()
 	Set Detection.Id=..ProductionHelper.BuildLadeID(Queue.BatchID, Queue.WPVerpak.UnitNr, Queue.WPVerpak.SubNr, Queue.ProductGetObjectId())
 	Set Director=..BuildDirectorFromQueue(Queue)
-	Do Detection.Director.Insert(Director)
+	;Do Detection.Director.Insert(Director)
+	Set Dual=..BuildDualFromQueue(Queue)
+	Do Detection.DUAL.Insert(Dual)
 	;w Director.AssetType,*9,Detection.Id,*9,Director.AssetID,!
 	Quit Detection
 ]]></Implementation>
@@ -166,6 +186,18 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BuildDualFromQueue">
+<FormalSpec>Queue</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	;XML <Director Production_Date="25-FEB-09" Type_Level="PRODUCT" Asset_Type="166141" Asset_ID="41843"/>
+	Set Dual=##class(APPS.VisiDot.dto.DUAL).%New()
+	Set Dual.RowInPallet=(Queue.WPVerpak.SlotNr-1)\10+1
+	Set Dual.ColInPallet=(Queue.WPVerpak.SlotNr-1#10)+1
+	Quit Dual
+]]></Implementation>
+</Method>
+
 <Method name="AddDetection2Capture">
 <FormalSpec>Detection,UnitNr</FormalSpec>
 <Private>1</Private>
@@ -197,7 +229,11 @@
 	Set Director=##class(APPS.VisiDot.dto.Director).%New()
 	Set Director.AssetID=30
 	Set Director.AssetType="VHossSlot"
-	Do Detection.Director.Insert(Director)
+	;Do Detection.Director.Insert(Director)
+	Set Dual=##class(APPS.VisiDot.dto.DUAL).%New()
+	Set Dual.RowInPallet=3
+	Set Dual.ColInPallet=10
+	Do Detection.DUAL.Insert(Dual)
 	Quit Detection
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/VisiDot/TestVHoss.cls.xml
===================================================================
diff -u -r1717 -r1750
--- vhUnitTest/APPS/VisiDot/TestVHoss.cls.xml	(.../TestVHoss.cls.xml)	(revision 1717)
+++ vhUnitTest/APPS/VisiDot/TestVHoss.cls.xml	(.../TestVHoss.cls.xml)	(revision 1750)
@@ -11,6 +11,10 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="CaptureHelper">
+<Type>%String</Type>
+</Property>
+
 <Property name="WebService">
 <Type>%String</Type>
 </Property>
@@ -26,70 +30,152 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Finish">
+<FormalSpec>ProcessedData</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..CaptureHelper=##class(APPS.VisiDot.impl.VHossCaptureHelper).%New(ProcessedData)
+	Quit ..CaptureHelper.GeefFoutCode()
+]]></Implementation>
+</Method>
+
 <Method name="All">
 <Implementation><![CDATA[
-	Write !,"### GOOD CAPTURE ###",!
-	Do ..TestGoodCapture()
+ /*	Write !,"### GOOD CAPTURE ###",!
+	Do ..zTestCorrect()
 	Write !,"### PLUSONE ###",!
-	Do ..TestPlusOne()
+	Do ..zTestPlusOne()
 	Write !,"### MINUS ONE ###",!
-	Do ..TestMinusOne()
+	Do ..zTestMinusOne()
 	Write !,"### TEST DUBBEL ###",!
-	Do ..TestDubbel()
+	Do ..zTestDubbel()
+	Write !,"### END OK ###",!
+	Do ..TestEnd()*/
 ]]></Implementation>
 </Method>
 
-<Method name="TestGoodCapture">
+<Method name="TestZijkantCorrect">
 <Description>
 do ##class(vhUnitTest.APPS.VisiDot.TestVHoss).%New("").All()</Description>
 <Implementation><![CDATA[
 	Do ..Init()
 	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
-	Write "**** CONTROLE ****",!
-	Do ..WebService.UpdateData("READ", Capture, .ResultDesc, .ProcessedData)
-	
-	Set ERP=ProcessedData.ERP.GetAt(1)
-	Do ERP.XMLExport(,"literal,indent")
-	
-	;Do $$$AssertTrue(ResultDesc,"CaptureOK")
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"Capture moet correct zijn (zonder fouten)")
 ]]></Implementation>
 </Method>
 
-<Method name="TestPlusOne">
+<Method name="TestZijkantPlusOne">
 <Implementation><![CDATA[
 	Do ..Init()
 	Set Capture=..VHossBuilder.CorrectVHossPlusOne(1,1)
-	Write "**** CONTROLE ****",!
-	Do ..WebService.UpdateData("READ", Capture, .ResultDesc, .ProcessedData)
-	;Do $$$AssertTrue(ResultDesc,"CaptureOK")
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossNoInfo(),"Capture bevat een extra lade (teveel)")
 ]]></Implementation>
 </Method>
 
-<Method name="TestMinusOne">
+<Method name="TestZijkantMinusOne">
 <Implementation><![CDATA[
 	Do ..Init()
 	Set Capture=..VHossBuilder.CorrectVHossMinusOne(1,1)
-	Write "**** CONTROLE ****",!
-	Do ..WebService.UpdateData("READ", Capture, .ResultDesc, .ProcessedData)
-	;Do $$$AssertTrue(ResultDesc,"CaptureOK")
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossOntbrekend(),"Capture bevat een ontbrekende lade")
 ]]></Implementation>
 </Method>
 
-<Method name="TestDubbel">
+<Method name="TestZijkantDubbel">
 <Implementation><![CDATA[
 	Do ..Init()
 	Set Capture=..VHossBuilder.CorrectVHossMinusOne(1,1)
-	Write "**** CONTROLE ****",!
-	Do ..WebService.UpdateData("READ", Capture, .ResultDesc, .ProcessedData)
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
 	
 	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
-	Write "**** CONTROLE ****",!
-	Do ..WebService.UpdateData("READ", Capture, .ResultDesc, .ProcessedData)
+	Do ..VHossBuilder.ZetBatchID()
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
 	
-	Set ERP=ProcessedData.ERP.GetAt(1)
-	Do ERP.XMLExport(,"literal,indent")
-	;Do $$$AssertTrue(ResultDesc,"CaptureOK")
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"Capture wordt voor een tweede keer ingelezen en is dan correct")
 ]]></Implementation>
 </Method>
+
+<Method name="TestZijkantZonderLade">
+<Implementation><![CDATA[
+	Do ..Init()
+	Set Capture=..VHossBuilder.CorrectVHoss(99,1)
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossGeenBatchID(),"Lege foto zonder Frame en Batch gegevens")
+]]></Implementation>
+</Method>
+
+<Method name="TestZijkantZonderLadeMetBatchID">
+<Implementation><![CDATA[
+	Do ..Init()
+	Set Capture=..VHossBuilder.CorrectVHoss(99,1)
+	Do ..VHossBuilder.ZetBatchID()
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossGeenLaden(),"Lege foto zonder Frame en Batch gegevens")
+]]></Implementation>
+</Method>
+
+<Method name="TestEnd">
+<Implementation><![CDATA[
+	Do ..Init()
+	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+	Set Capture=..VHossBuilder.CorrectVHoss(2,1)
+	Do ..VHossBuilder.ZetBatchID()
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+	Set Capture=..VHossBuilder.CorrectVHoss(2,2)
+	Do ..VHossBuilder.ZetBatchID()
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+	
+	Set Capture=..VHossBuilder.Empty()
+	Do ..VHossBuilder.ZetBatchID()
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossEnd(), Capture, .ResultDesc, .ProcessedData)
+	
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).OK(),"Alle queue elementen van de batch hebben frameIDs")
+]]></Implementation>
+</Method>
+
+<Method name="TestEndNotAllDone">
+<Implementation><![CDATA[
+	Do ..Init()
+	Set Capture=..VHossBuilder.CorrectVHoss(1,1)
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+	Set Capture=..VHossBuilder.CorrectVHoss(2,2)
+	Do ..VHossBuilder.ZetBatchID()
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossRead(), Capture, .ResultDesc, .ProcessedData)
+	
+	Set Capture=..VHossBuilder.Empty()
+	Do ..VHossBuilder.ZetBatchID()
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossEnd(), Capture, .ResultDesc, .ProcessedData)
+	
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossOntbrekendeFrame(),"1 ontbrekend frame want 1 zijkant is niet gescanned geworden")
+]]></Implementation>
+</Method>
+
+<Method name="TestEndGeenBatchID">
+<Implementation><![CDATA[
+	Do ..Init()
+	
+	Set Capture=..VHossBuilder.Empty()
+	Do ..WebService.UpdateData(##class(APPS.VisiDot.enu.ActionCodes).VHossEnd(), Capture, .ResultDesc, .ProcessedData)
+	
+	Set ErrorCode=..Finish(ProcessedData)	
+	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossGeenBatchID(),"Er mag geen batchID gekend zijn")
+]]></Implementation>
+</Method>
 </Class>
 </Export>