Index: APPS/TRANSP/impl/TransportService/Nacalculator.cls.xml =================================================================== diff -u -r52414 -r52415 --- APPS/TRANSP/impl/TransportService/Nacalculator.cls.xml (.../Nacalculator.cls.xml) (revision 52414) +++ APPS/TRANSP/impl/TransportService/Nacalculator.cls.xml (.../Nacalculator.cls.xml) (revision 52415) @@ -18,8 +18,13 @@ 1 + +TECH.Mail.MailAPI +1 + + -TransportdataVoorKlantBepaler:APPS.TRANSP.impl.TransportService.Nacalculator.TransportdataVoorKlantBepaler="",RapportGenerator:APPS.common.Rapport.impl.BestandGeneratorDataTransferObjectBased="",RapportDataFactory:APPS.TRANSP.impl.TransportService.Nacalculator.RapportDataFactory="" +TransportdataVoorKlantBepaler:APPS.TRANSP.impl.TransportService.Nacalculator.TransportdataVoorKlantBepaler="",RapportGenerator:APPS.common.Rapport.impl.BestandGeneratorDataTransferObjectBased="",RapportDataFactory:APPS.TRANSP.impl.TransportService.Nacalculator.RapportDataFactory="",MailApi:TECH.Mail.MailAPI="" 1 1 %Status @@ -28,6 +33,7 @@ Set ..TransportdataVoorKlantBepaler = $$$Inject(TransportdataVoorKlantBepaler, ##class(APPS.TRANSP.impl.TransportService.Nacalculator.TransportdataVoorKlantBepaler).%New()) Set ..RapportGenerator = $$$Inject(RapportGenerator, ##class(APPS.common.Rapport.impl.BestandGeneratorDataTransferObjectBased).%New()) Set ..RapportDataFactory = $$$Inject(RapportDataFactory, ##class(APPS.TRANSP.impl.TransportService.Nacalculator.RapportDataFactory).%New()) + Set ..MailApi = $$$Inject(MailApi, ##class(TECH.Mail.impl.MailAPI).%New()) Quit $$$OK ]]> @@ -46,6 +52,14 @@ Do ..RapportGenerator.MaakBestand(..RapportDataFactory.MaakRapportData(RitDataLijst, Bestandsnaam)) //mailen + #dim Mail As TECH.Mail.Mail = ..MailApi.MaakNieuwMail() + Do Mail.ZetVerzender($$$SystemMail("OV")) + Do Mail.ZetOnderwerp("Nacalculatie transporten "_KlantId) + Do Mail.ZetInhoud("zie attachment - begindatum = '"_BeginDatum_"' en einddatum = '"_EindDatum_"'") + Do Mail.ZetIsHTML($$$True) + Do Mail.VoegToeBijlage(Bestandsnaam) + Do Mail.VoegToeOntvanger("tve@vanhoecke.be") + Do ..MailApi.VerstuurMail(Mail) Index: vhUnitTest/APPS/TRANSP/impl/TransportService/Nacalculator/DoeNalculatie/Test.cls.xml =================================================================== diff -u -r52412 -r52415 --- vhUnitTest/APPS/TRANSP/impl/TransportService/Nacalculator/DoeNalculatie/Test.cls.xml (.../Test.cls.xml) (revision 52412) +++ vhUnitTest/APPS/TRANSP/impl/TransportService/Nacalculator/DoeNalculatie/Test.cls.xml (.../Test.cls.xml) (revision 52415) @@ -21,12 +21,17 @@ Set RapportGeneratorMock = ##class(vhTest.Mock.APPS.common.Rapport.impl.BestandGeneratorTemplate).%New() Do RapportGeneratorMock.VerwachtMethodCall("MaakBestand",BestandRapportDataDataTransferObjectBased).ExactAantalKeer(1) - Set Nacalculator = ##class(APPS.TRANSP.impl.TransportService.Nacalculator).%New(TransportdataVoorKlantBepalerMock,RapportGeneratorMock,RapportDataFactoryMock) + Set MailApi = ##class(vhTest.Mock.TECH.Mail.MailAPI).%New() + Do MailApi.VerwachtMethodCall("MaakNieuwMail").DanReturn(##class(TECH.Mail.impl.Mail).%New()) + Do MailApi.IndienMethodCall("VerstuurMail",$$$ElkeWaarde).DanDoeNiks() + + Set Nacalculator = ##class(APPS.TRANSP.impl.TransportService.Nacalculator).%New(TransportdataVoorKlantBepalerMock,RapportGeneratorMock,RapportDataFactoryMock,MailApi) Do Nacalculator.DoeNacalculatie(KlantId,BeginDatum,EindDatum) Do TransportdataVoorKlantBepalerMock.Verifieer() Do RapportGeneratorMock.Verifieer() Do RapportDataFactoryMock.Verifieer() + Do MailApi.Verifieer() ]]>