Moved waiting-for-active-assignment logic into student controller