Updated end date calculation for weekly usage