Added Calendar to FishByType

Instead of doing separate filters for date and fish type we will be
combining them into one filter.