Index: BL/PPS/TBX/WPPers/InfoBepaler.cls.xml
===================================================================
diff -u -r57669 -r57672
--- BL/PPS/TBX/WPPers/InfoBepaler.cls.xml	(.../InfoBepaler.cls.xml)	(revision 57669)
+++ BL/PPS/TBX/WPPers/InfoBepaler.cls.xml	(.../InfoBepaler.cls.xml)	(revision 57672)
@@ -50,38 +50,39 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim Info1 As %String = ""
-
-	#dim TBX As DOM.PM.TBXProduct.TBXLade = ..ProductAPI.GeefProduct(PRNr)
-
-	#dim Internebreedte As %Float = TBX.GeefInterneBreedte()
-	#dim Draagkracht As %Float = TBX.GeefDraagkracht()
-	#dim Variant As DOM.PM.enu.Variant = TBX.GeefVariant()
-	#dim Antislipmat As DOM.PM.enu.TBXAntislipmat =$S(TBX.GeefAntislipmatNietMeeleveren():"",1:TBX.GeefAntislipmat()) ; Antislipmat
-	#dim Blumotion As DOM.PM.enu.TBXBlumotion = TBX.GeefBlumotion()
-	#dim LadeType As DOM.PM.enu.TBXLadeType = TBX.GeefLadeType()
-	#dim RugMateriaal As DOM.PM.enu.TBXRugwandMateriaal = TBX.GeefRugMateriaal()
-	#dim Onderdelenspecial As %String = TBX.GeefOnderdelenSpeciaal()
-	#dim IsSpoelbakLade As %Boolean = TBX.IsSpoelbakLade()
 	
-	Set:(LadeType="B") Info1=..GeefInfoMetMelding(Info1,"FRONT")
-	Set:("0"'[Antislipmat) Info1=..GeefInfoMetMelding(Info1,"MAT "_..MatFormatter.GeefKorteNotatie(..TBXMatToEnuMatConverter.GeefMateriaal(Antislipmat),..TBXMatToEnuMatConverter.GeefKleur(Antislipmat)))
-	Set:(Onderdelenspecial'="") Info1=..GeefInfoMetMelding(Info1,"SPECIAAL : "_$CASE(Onderdelenspecial,"F":"FRONT","R":"RUG","B":"BODEM","BR":"BODEM&RUG",:Onderdelenspecial))
-	Set:(IsSpoelbakLade) Info1=..GeefInfoMetMelding(Info1,"SPOELBAK/SYFON")
-	Set:(Blumotion="T") Info1=..GeefInfoMetMelding(Info1,"TIP-ON")
-	Set:(Variant=##class(DOM.PM.enu.LadeVariant).TBXBaliko() ) Info1=..GeefInfoMetMelding(Info1,"HOUTEN BALIKO LADE")
-	Set:(Internebreedte<..#MinIB) Info1=..GeefInfoMetMelding(Info1,"EXTRA SMAL")
-	Set:(Internebreedte>..#MaxIB) Info1=..GeefInfoMetMelding(Info1,">1500")
-	Set:(Draagkracht=80) Info1=..GeefInfoMetMelding(Info1,"80kg",##class(APPS.Halux.PPS.Activiteit.impl.common.enu.BoxpressTekstKleur).Groen())
-	If (RugMateriaal=##class(DOM.PM.enu.TBXRugwandMateriaal).Staal()) {
-		Set Info1=..GeefInfoMetMelding(Info1,"stalen rug",##class(APPS.Halux.PPS.Activiteit.impl.common.enu.BoxpressTekstKleur).Groen())
+	If (Status=$$$tsRemoved) {
+		Set Info1 = "B:Verwijderd" ; overschrijft alle vorige	
+	} Else {
+		#dim TBX As DOM.PM.TBXProduct.TBXLade = ..ProductAPI.GeefProduct(PRNr)
+		#dim Internebreedte As %Float = TBX.GeefInterneBreedte()
+		#dim Draagkracht As %Float = TBX.GeefDraagkracht()
+		#dim Variant As DOM.PM.enu.Variant = TBX.GeefVariant()
+		#dim Antislipmat As DOM.PM.enu.TBXAntislipmat =$S(TBX.GeefAntislipmatNietMeeleveren():"",1:TBX.GeefAntislipmat()) ; Antislipmat
+		#dim Blumotion As DOM.PM.enu.TBXBlumotion = TBX.GeefBlumotion()
+		#dim LadeType As DOM.PM.enu.TBXLadeType = TBX.GeefLadeType()
+		#dim RugMateriaal As DOM.PM.enu.TBXRugwandMateriaal = TBX.GeefRugMateriaal()
+		#dim Onderdelenspecial As %String = TBX.GeefOnderdelenSpeciaal()
+		#dim IsSpoelbakLade As %Boolean = TBX.IsSpoelbakLade()
+		
+		Set:(LadeType="B") Info1=..GeefInfoMetMelding(Info1,"FRONT")
+		Set:("0"'[Antislipmat) Info1=..GeefInfoMetMelding(Info1,"MAT "_..MatFormatter.GeefKorteNotatie(..TBXMatToEnuMatConverter.GeefMateriaal(Antislipmat),..TBXMatToEnuMatConverter.GeefKleur(Antislipmat)))
+		Set:(Onderdelenspecial'="") Info1=..GeefInfoMetMelding(Info1,"SPECIAAL : "_$CASE(Onderdelenspecial,"F":"FRONT","R":"RUG","B":"BODEM","BR":"BODEM&RUG",:Onderdelenspecial))
+		Set:(IsSpoelbakLade) Info1=..GeefInfoMetMelding(Info1,"SPOELBAK/SYFON")
+		Set:(Blumotion="T") Info1=..GeefInfoMetMelding(Info1,"TIP-ON")
+		Set:(Variant=##class(DOM.PM.enu.LadeVariant).TBXBaliko() ) Info1=..GeefInfoMetMelding(Info1,"HOUTEN BALIKO LADE")
+		Set:(Internebreedte<..#MinIB) Info1=..GeefInfoMetMelding(Info1,"EXTRA SMAL")
+		Set:(Internebreedte>..#MaxIB) Info1=..GeefInfoMetMelding(Info1,">1500")
+		Set:(Draagkracht=80) Info1=..GeefInfoMetMelding(Info1,"80kg",##class(APPS.Halux.PPS.Activiteit.impl.common.enu.BoxpressTekstKleur).Groen())
+		If (RugMateriaal=##class(DOM.PM.enu.TBXRugwandMateriaal).Staal()) {
+			Set Info1=..GeefInfoMetMelding(Info1,"stalen rug",##class(APPS.Halux.PPS.Activiteit.impl.common.enu.BoxpressTekstKleur).Groen())
+		}
+		
+		if TBX.BevatSynchro() || TBX.BevatTOBSynchroStang() {
+			Set Info1 = ..GeefInfoMetMelding(Info1,"SYNCST")
+		}
 	}
 	
-	if TBX.BevatSynchro() || TBX.BevatTOBSynchroStang() {
-		Set Info1 = ..GeefInfoMetMelding(Info1,"SYNCST")
-	}
-	
-	Set:(Status=$$$tsRemoved) Info1="B:Verwijderd" ; overschrijft alle vorige
-
 	Quit Info1
 ]]></Implementation>
 </Method>
@@ -102,8 +103,8 @@
 
 	#dim Info2 As %String = ""
 	
-	If (TBX.GeefDwarsverdeling()>0) {
-		Set Info2 = ..GeefInfoMetMelding(Info2, "DWV:"_TBX.AantalDwarsverdelingen)
+	If $$$Not(TBX.GeefDwarsverdeling()=##class(DOM.PM.enu.TBXDwarsverdeling).Zonder()) {
+		Set Info2 = ..GeefInfoMetMelding(Info2, "DWV:"_TBX.GeefDwarsverdeling())
 	}
 	
 	If (LaatsteBatch) {
Index: vhUnitTest/BL/PPS/TBX/WPPers/InfoBepaler/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/BL/PPS/TBX/WPPers/InfoBepaler/Test.cls.xml	(revision 0)
+++ vhUnitTest/BL/PPS/TBX/WPPers/InfoBepaler/Test.cls.xml	(revision 57672)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.BL.PPS.TBX.WPPers.InfoBepaler.Test">
+<IncludeCode>BL.PPS.TBX.Common</IncludeCode>
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="MatFormatterMock">
+<Type>vhTest.Mock.APPS.Halux.PPS.impl.Formatter.Mat</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TBXMatToEnuMatConverterMock">
+<Type>vhTest.Mock.BL.PPS.TBX.impl.TBXMatToEnuMatConverter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ProductAPIMock">
+<Type>vhTest.Mock.DOM.PM.ProductAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TBXLadeMock">
+<Type>vhTest.Mock.DOM.PM.TBXProduct.TBXLade</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super()
+	Set ..MatFormatterMock = ##class(vhTest.Mock.APPS.Halux.PPS.impl.Formatter.Mat).%New()
+	Do ..MatFormatterMock.IndienMethodCall("GeefKorteNotatie", $$$ElkeWaarde, $$$ElkeWaarde).DanReturn("Mat")
+	
+	Set ..TBXMatToEnuMatConverterMock = ##class(vhTest.Mock.BL.PPS.TBX.impl.TBXMatToEnuMatConverter).%New()
+	Do ..TBXMatToEnuMatConverterMock.IndienMethodCall("GeefMateriaal", $$$ElkeWaarde).DanReturn(##class(DOM.PM.enu.MATMateriaal).Antislip())
+	Do ..TBXMatToEnuMatConverterMock.IndienMethodCall("GeefKleur", $$$ElkeWaarde).DanReturn(##class(DOM.PM.enu.MATKleur).AntiSlipFiberAntraciet())
+	
+	Set ..TBXLadeMock = ##class(vhTest.Mock.DOM.PM.TBXProduct.TBXLade).%New()
+	
+	Set ..ProductAPIMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
+	Do ..ProductAPIMock.IndienMethodCall("GeefProduct", "ProductNummer").DanReturn(..TBXLadeMock)
+]]></Implementation>
+</Method>
+
+<Method name="Test: Geeft lege info2 zonder dwarsverdeling en niet laatste batch">
+<Implementation><![CDATA[
+	Do ..TBXLadeMock.IndienMethodCall("GeefDwarsverdeling").DanReturn(##class(DOM.PM.enu.TBXDwarsverdeling).Zonder())
+	
+	Set InfoBepaler = ##class(BL.PPS.TBX.WPPers.InfoBepaler).%New(,,..ProductAPIMock)
+	#dim Info2 As %String = InfoBepaler.GeefInfo2("ProductNummer","BatchID",$$$False)
+	
+	Do $$$AssertEquals(Info2,"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Geeft info2 met dwarsverdeling">
+<Implementation><![CDATA[
+	Do ..TBXLadeMock.VerwachtMethodCall("GeefDwarsverdeling").DanReturn(##class(DOM.PM.enu.TBXDwarsverdeling).Een())
+	
+	Set InfoBepaler = ##class(BL.PPS.TBX.WPPers.InfoBepaler).%New(,,..ProductAPIMock)
+	#dim Info2 As %String = InfoBepaler.GeefInfo2("ProductNummer","BatchID",$$$False)
+	
+	Do $$$AssertEquals(Info2,"R:DWV:1")
+	Do ..TBXLadeMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Geeft info2 met laatste Batch">
+<Implementation><![CDATA[
+	Do ..TBXLadeMock.IndienMethodCall("GeefDwarsverdeling").DanReturn(##class(DOM.PM.enu.TBXDwarsverdeling).Zonder())
+	
+	Set InfoBepaler = ##class(BL.PPS.TBX.WPPers.InfoBepaler).%New(,,..ProductAPIMock)
+	#dim Info2 As %String = InfoBepaler.GeefInfo2("ProductNummer","BatchID",$$$True)
+	
+	Do $$$AssertEquals(Info2,"G:Laatste BatchID")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Geeft info1 met enkel &apos;Verwijderd&apos; indien status &apos;tsRemoved&apos; opgegeven wordt">
+<Implementation><![CDATA[
+	Set InfoBepaler = ##class(BL.PPS.TBX.WPPers.InfoBepaler).%New(,,)
+	#dim Info1 As %String = InfoBepaler.GeefInfo1("ProductNummer",$$$tsRemoved)
+	
+	Do $$$AssertEquals(Info1,"B:Verwijderd")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>