Index: APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml =================================================================== diff -u -r71929 -r73385 --- APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml (.../BatchPitchDataExporter.cls.xml) (revision 71929) +++ APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml (.../BatchPitchDataExporter.cls.xml) (revision 73385) @@ -1,13 +1,23 @@ -TECH.RegisteredObject +TECH.Mockable + +%Integer +1 + + APPS.Halux.PPS.MES.MESService 1 + +APPS.Halux.common.BatchService +1 + + APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository 1 @@ -29,7 +39,7 @@ -MESService:APPS.Halux.PPS.MES.MESService="",BatchPitchedRepository:APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository="",BatchNaarObjectiveUitvoeringInfoRepository:APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfoRepository="",Logger:vhLib.Logger="",BatchPitchExportedService:APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService="" +MESService:APPS.Halux.PPS.MES.MESService="",BatchPitchedRepository:APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository="",BatchNaarObjectiveUitvoeringInfoRepository:APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfoRepository="",Logger:vhLib.Logger="",BatchPitchExportedService:APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService="",BatchService:APPS.Halux.common.BatchService="" 1 1 %Status @@ -40,21 +50,21 @@ Set ..BatchNaarObjectiveUitvoeringInfoRepository = $$$Inject(BatchNaarObjectiveUitvoeringInfoRepository, ##class(APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfoRepository).%New()) Set ..BatchPitchExportedService = $$$Inject(BatchPitchExportedService, ##class(APPS.Halux.PPS.Activiteit.impl.common.BatchNaarObjectiveIoCContainer).Instance().Resolve("BatchPitchExportedService")) Set ..Logger = $$$Inject(Logger, ##class(vhLib.Logger).%New("APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter")) + Set ..BatchService = $$$Inject(BatchService, ##class(APPS.ApplicatieContext).Instance().GeefProductieAPI().GeefBatchService()) Quit $$$OK ]]> + + +Wordt opgeroepen bij het resetten van een batch +BatchID:%String,IsTriggerResetBatch:%Boolean=0 + + + BatchId:%String 1 @@ -97,7 +127,7 @@ -Batch:APPS.Halux.common.impl.BatchImpl +Batch:APPS.Halux.common.impl.BatchImpl,IsTriggerResetBatch:%Boolean=0 1 %Boolean -AansturingActie:APPS.Halux.PPS.Activiteit.impl.UitvoeringInfoLijstVerwerkerBasis,Batch:APPS.Halux.common.impl.BatchImpl +AansturingActie:APPS.Halux.PPS.Activiteit.impl.UitvoeringInfoLijstVerwerkerBasis,Batch:APPS.Halux.common.impl.BatchImpl,IsTriggerResetBatch:%Boolean=0 1 Index: vhTest/Mock/APPS/Halux/Planning/BatchStarter.cls.xml =================================================================== diff -u -r29059 -r73385 --- vhTest/Mock/APPS/Halux/Planning/BatchStarter.cls.xml (.../BatchStarter.cls.xml) (revision 29059) +++ vhTest/Mock/APPS/Halux/Planning/BatchStarter.cls.xml (.../BatchStarter.cls.xml) (revision 73385) @@ -16,7 +16,7 @@ -Batch:APPS.Halux.common.Batch +Batch:APPS.Halux.common.Batch,IsStartNaReset:%Boolean=0 Index: APPS/Halux/Planning/impl/BatchResetter.cls.xml =================================================================== diff -u -r72201 -r73385 --- APPS/Halux/Planning/impl/BatchResetter.cls.xml (.../BatchResetter.cls.xml) (revision 72201) +++ APPS/Halux/Planning/impl/BatchResetter.cls.xml (.../BatchResetter.cls.xml) (revision 73385) @@ -62,7 +62,7 @@ Do ..BatchBewaarder.BewaarBatch(Batch) do ..BatchSequentieVerwijderaar.VerwijderBatchSequentie(Batch) do ##class(APPS.Halux.common.event.BatchEventRaiser).RaiseBatchGeresetEvent(Batch.GeefID()) - Do ..BatchStarter.StartBatch(Batch) + Do ..BatchStarter.StartBatch(Batch, $$$True) } ]]> Index: APPS/Halux/PPS/Document/impl/common/BatchNaarObjective.cls.xml =================================================================== diff -u -r73369 -r73385 --- APPS/Halux/PPS/Document/impl/common/BatchNaarObjective.cls.xml (.../BatchNaarObjective.cls.xml) (revision 73369) +++ APPS/Halux/PPS/Document/impl/common/BatchNaarObjective.cls.xml (.../BatchNaarObjective.cls.xml) (revision 73385) @@ -61,11 +61,10 @@ -Lijst:APPS.Halux.PPS.dto.UitvoeringInfoLijst,ActiviteitParameters:APPS.Halux.PPS.Activiteit.ActiviteitParameters,ActieParameters:%ListOfDataTypes="" +Lijst:APPS.Halux.PPS.dto.UitvoeringInfoLijst,ActiviteitParameters:APPS.Halux.PPS.Activiteit.ActiviteitParameters,ActieParameters:%ListOfDataTypes="",IsTriggerResetBatch:%Boolean=0 APPS.Halux.PPS.dto.UitvoeringResultaat 1 + +vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter +1 + + aTestName:%String @@ -89,19 +95,60 @@ Do ..MatServiceMock.VerwachtMethodCall("BewaarMattenInfo", BatchStub).DanDoeNiks() Do ..DocumentGeneratorServiceMock.VerwachtMethodCall("GenereerDocumenten", BatchStub).DanDoeNiks() + Do ..BatchPitchDataExporter.VerwachtMethodCall("ExporteerBatchPitchedDataNaarObjectiveVoorBatch", ..#BatchID).DanDoeNiks().ExactAantalKeer(0) Do ..InitImplementation() - Do ..BatchStarterImpl.StartBatch(BatchStub) + Do ..BatchStarterImpl.StartBatch(BatchStub, $$$False) Do $$$AssertEquals(BatchBewaarderSpy.BewaarBatchAantalKeerOpgeroepen,2) Do SequentieServiceMock.Verifieer() Do ..DnaCodeServiceMock.Verifieer() Do ..MatServiceMock.Verifieer() Do ..DocumentGeneratorServiceMock.Verifieer() + Do ..BatchPitchDataExporter.Verifieer() Do $$$AssertEquals(EventRaiserSpy.IsEventGeraised("BatchGeslotenEvent"),"") ]]> + + + + 1 - Index: vhTest/Mock/APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml =================================================================== diff -u --- vhTest/Mock/APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml (revision 0) +++ vhTest/Mock/APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml (revision 73385) @@ -0,0 +1,31 @@ + + + + +Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig. +Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt +1 +APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter,Tools.Mock.MockClassBase +right + + +MESService:APPS.Halux.PPS.MES.MESService="",BatchPitchedRepository:APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository="",BatchNaarObjectiveUitvoeringInfoRepository:APPS.Halux.PPS.Activiteit.impl.common.dto.BatchNaarObjectiveUitvoeringInfoRepository="",Logger:vhLib.Logger="",BatchPitchExportedService:APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService="",BatchService:APPS.Halux.common.BatchService="" +%Status + + + + + + + + +BatchID:%String,IsTriggerResetBatch:%Boolean=0 + + + + + + Index: APPS/Halux/Planning/impl/BatchStarter.cls.xml =================================================================== diff -u -r72803 -r73385 --- APPS/Halux/Planning/impl/BatchStarter.cls.xml (.../BatchStarter.cls.xml) (revision 72803) +++ APPS/Halux/Planning/impl/BatchStarter.cls.xml (.../BatchStarter.cls.xml) (revision 73385) @@ -43,8 +43,13 @@ 1 + +APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter +1 + + -BatchBewaarder:APPS.Halux.Planning.BatchBewaarder,BatchSequentieService:APPS.Halux.common.impl.SequentieService,BatchSequentieVerwijderaar:APPS.Halux.Planning.impl.BatchSequentieVerwijderaar,Logger:vhLib.Logger,DnaCodeService:APPS.Halux.AAP.DnaCodeService,MatService:APPS.Halux.PPS.MatService,DocumentGeneratorService:APPS.Halux.PPS.DocumentGeneratorService,BatchService:APPS.Halux.common.impl.BatchService="" +BatchBewaarder:APPS.Halux.Planning.BatchBewaarder,BatchSequentieService:APPS.Halux.common.impl.SequentieService,BatchSequentieVerwijderaar:APPS.Halux.Planning.impl.BatchSequentieVerwijderaar,Logger:vhLib.Logger,DnaCodeService:APPS.Halux.AAP.DnaCodeService,MatService:APPS.Halux.PPS.MatService,DocumentGeneratorService:APPS.Halux.PPS.DocumentGeneratorService,BatchService:APPS.Halux.common.impl.BatchService="",BatchPitchDataExporter:APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter="" 1 1 %Status @@ -58,6 +63,7 @@ Set ..MatService = $$$Inject(MatService, ##class(APPS.Halux.PPS.MatService).%New()) Set ..DocumentGeneratorService = $$$Inject(DocumentGeneratorService, ##class(APPS.Halux.PPS.DocumentGeneratorService).%New()) Set ..BatchService = $$$Inject(BatchService, ##class(APPS.Halux.common.impl.BatchService).%New()) + Set ..BatchPitchDataExporter = $$$Inject(BatchPitchDataExporter, ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter).%New()) Quit $$$OK ]]> @@ -75,7 +81,7 @@ -Batch:APPS.Halux.common.Batch +Batch:APPS.Halux.common.Batch,IsTriggerResetBatch:%Boolean=0 + + +BatchID:%String,IsTriggerResetBatch:%Boolean +1 + + Index: vhTest/Fake/APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml =================================================================== diff -u --- vhTest/Fake/APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml (revision 0) +++ vhTest/Fake/APPS/Halux/Planning/Pitching/impl/BatchPitchDataExporter.cls.xml (revision 73385) @@ -0,0 +1,23 @@ + + + + +Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn. +Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt +1 +APPS.Halux.Planning.Pitching.impl.BatchPitchDataExporter + + + + + + +BatchID:%String + + + + + +