Bug Fix in Next Class Function

After some testing noticed a bug where sometimes class 1 remains as the
soonest class even its time already passed.  So added a second level of
check to ensure that if the time already passed it would not be counted
as an upcoming class.