Fix issues with trip final screen and print
Merge pull request #136 from CG-CamSys/281-trip-selection-and-printing-issues

Fix issues with trip final screen and print