SA-49 make sure to check start/end on recurring events, not just recu…

…rring period

git-svn-id: https://source.jasig.org/sa/sched-assist/trunk@25906 f5dbab47-78f9-eb45-b975-e544023573eb

sched-assist-api/src/main/java/org/jasig/schedassist/model/VisibleScheduleBuilder.java

@@ -217,19 +217,19 @@ protected VisibleSchedule calculateVisibleScheduleNoAttendingCheck(Date startTim
 
 			// if we reach this point, this event is not skippable,
 			// it's going to be either BUSY, FREE with visitors, or ATTENDING
+			// whether event is recurring or not, check block on start/end
+			Date startDate = event.getStartDate().getDate();
+			Date endDate = event.getEndDate(true).getDate();
+			mutateAppropriateBlockInVisibleSchedule(visibleSchedule, event, calendarAccount, null, startDate, endDate, false);
+
 			if(eventUtils.isEventRecurring(event)) {
 				// expand the recurrence rules
 				PeriodList recurrenceList = this.eventUtils.calculateRecurrence(event, startTime, endTime);
 				for(Object o : recurrenceList) {
 					Period period = (Period) o;
 					mutateAppropriateBlockInVisibleSchedule(visibleSchedule, event, calendarAccount, null, period.getStart(), period.getEnd(), false);
 				}
-			} else {	
-				// event is not recurring, just check block on start/end
-				Date startDate = event.getStartDate().getDate();
-				Date endDate = event.getEndDate(true).getDate();
-				mutateAppropriateBlockInVisibleSchedule(visibleSchedule, event, calendarAccount, null, startDate, endDate, false);
-			}
+			} 
 		}
 
 		return visibleSchedule;