Index: vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml
===================================================================
diff -u -r73748 -r74200
--- vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml (.../Test.cls.xml) (revision 73748)
+++ vhUnitTest/APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator/GenereerOptiesVoorLade/Test.cls.xml (.../Test.cls.xml) (revision 74200)
@@ -84,6 +84,9 @@
#dim ToeleveringLijnStub As vhUnitTest.APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator.GenereerOptiesVoorLade.ToeleveringLijnMock = ..GeefToeleveringlijnMock(..#DummyProductId, ..#DummyInventTransId, ..#DummyAxConfigId)
#dim ToeleveringStub As vhTest.Mock.DOM.AKP.Toelevering = ..GeefToeleveringStub(..#DummyToeleveringId, ToeleveringLijnStub)
#dim ProductMock As vhTest.Mock.DOM.PM.MaatwerkProduct = ..GeefProductMock(..#DummyProductId, ..#DummyKorttekst, ..#DummyLangtekst, ..#DummyDossierCode, ..#DummyFscClaim, ..LbxKenmerken)
+ Set HalffabItemsBoomMock = ##class(vhTest.Mock.DOM.PM.Maatwerk.Calc.HF.HalffabItemsBoom).%New()
+ Do HalffabItemsBoomMock.VerwachtMethodCall("BevatRol", "TiponBlumotionSynchronisatieStang").DanReturn($$$False)
+ Do ProductMock.VerwachtMethodCall("GeefHalffabItemsBoom", "").DanReturn(HalffabItemsBoomMock)
Set ProductApiMock = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()
Do ProductApiMock.VerwachtMethodCall("GeefProduct", ..#DummyProductId).DanReturn(ProductMock)
@@ -98,7 +101,7 @@
Set Generator = ##class(APPS.Halux.PPS.Document.impl.common.BatchNaarObjective.OptieGenerator.ProductOptiesGenerator).%New(ProductApiMock, DnaCodeServiceMock, IngegevenKenmerkenSpaceStepHelperMock, , HoutCertificaatServiceMock)
#dim Resultaat As %ListOfObjects = Generator.GenereerOptiesVoorLade(ToeleveringStub, ..UitvoeringInfo)
- Do $$$AssertEquals(Resultaat.Size, 9)
+ Do $$$AssertEquals(Resultaat.Size, 10)
Do ..AssertOptie(Resultaat.GetAt(1), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-PIN", ..#DummyDnaCode)
Do ..AssertOptie(Resultaat.GetAt(2), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-SHORTPIN", "ode")
Do ..AssertOptie(Resultaat.GetAt(3), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Inventtransid", ..#DummyInventTransId)
@@ -107,13 +110,15 @@
Do ..AssertOptie(Resultaat.GetAt(6), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Langtekst", ..#DummyLangtekst)
Do ..AssertOptie(Resultaat.GetAt(7), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Dossiercode", ..#DummyDossierCode)
Do ..AssertOptie(Resultaat.GetAt(8), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-FSC-claim", "null")
- Do ..AssertOptie(Resultaat.GetAt(9), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Vhoss-info", "null")
+ Do ..AssertOptie(Resultaat.GetAt(9), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-Vhoss-info", "null")
+ Do ..AssertOptie(Resultaat.GetAt(10), "LADE 00" _ ..#SequentieNummerLade, "00" _ ..#SequentieNummerLade _ "-TOBSynchroLinkageLength", 0)
Do ProductMock.Verifieer()
Do ProductApiMock.Verifieer()
Do DnaCodeServiceMock.Verifieer()
Do HoutCertificaatServiceMock.Verifieer()
Do IngegevenKenmerkenSpaceStepHelperMock.Verifieer()
+ Do HalffabItemsBoomMock.Verifieer()
]]>
Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml
===================================================================
diff -u -r73748 -r74200
--- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml (.../ProductOptiesGenerator.cls.xml) (revision 73748)
+++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator/ProductOptiesGenerator.cls.xml (.../ProductOptiesGenerator.cls.xml) (revision 74200)
@@ -70,6 +70,7 @@
Do Opties.Insert(..GeefOptieVoorLade(..PrependNul(SequentieNummerLade), "-" _ "FSC-claim", ..GeefFSCLogoURL(Product)))
Do Opties.Insert(..GeefOptieVoorLade(..PrependNul(SequentieNummerLade), "-" _ "Vhoss-info", ..GeefVhossInfo(UitvoeringInfo)))
+ Do Opties.Insert(..GeefOptieVoorLade(..PrependNul(SequentieNummerLade), "-" _ "TOBSynchroLinkageLength", ..GeefTOBSynchroStangLengteInfo(UitvoeringInfo)))
Quit Opties
]]>
@@ -193,6 +194,28 @@
Quit FSCLogoUrl
]]>
+
+
+UitvoeringInfo:APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfo
+%String
+
+
Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator.cls.xml
===================================================================
diff -u -r73895 -r74200
--- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator.cls.xml (.../OptieGenerator.cls.xml) (revision 73895)
+++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective/OptieGenerator.cls.xml (.../OptieGenerator.cls.xml) (revision 74200)
@@ -72,19 +72,28 @@
%String
= NieuweLiReLogicaLiveVanafFase)) {
- #dim Halffab As DOM.PM.Maatwerk.Calc.HF.Halffab = HalffabItem.GeefHalffab()
+ Set Halffab = HalffabItem.GeefHalffab()
If (Halffab.LiRe = ##class(DOM.PM.enu.LiRe).LinksRechts()) {
Set RolNaam = "LinksRechts"
}
}
- If ($IsObject(HalffabItem.ParentItem) && $$$Not(HalffabItem.ParentItem.GeefRol() = IngegevenKenmerken.GeefVariant())) {
+ If (##class(TECH.StringUtils).Equals(RolNaam, "TiponBlumotionSynchronisatieStang") && (HuidigeMesFase >= NieuweTOBLogicaLiveVanafFase)) {
+ If HalffabItem.%Extends(##class(DOM.PM.Maatwerk.Calc.HF.BewerktHalffabItem).%ClassName(1)) {
+ Set RolNaam = "TOBSynchroLinkage.Processed"
+ } Else {
+ Set RolNaam = "TOBSynchroLinkage.Standard"
+ }
+ }
+
Set RolNaam = HalffabItem.ParentItem.GeefRol() _ "." _ RolNaam
}