[Neil, Chris] Move the school and locations calculations back into scope for date ranges <= 2 months.
[Neil, Chris] Use the same calculations for arbitrary weeks as the current week because calculating each school individually gave incorrect(?) results.
[Neil, Chris] Fixed naming.
[Neil, Chris] Removed unused variable.
[Neil, Chris] Improved naming.