Fixed calculateExpectedArrival
(uses orderPeriod instead of actPeriod for calculation)