diff --git a/CampusAppWP8/CampusAppWP8/Feed/TimeTable/AppointmentFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/TimeTable/AppointmentFeed.cs index 6e52cc16..50259e02 100644 --- a/CampusAppWP8/CampusAppWP8/Feed/TimeTable/AppointmentFeed.cs +++ b/CampusAppWP8/CampusAppWP8/Feed/TimeTable/AppointmentFeed.cs @@ -137,7 +137,7 @@ namespace CampusAppWP8.Feed.TimeTable } else { - if (newAppModel.IsDate(DateTime.Today, this.span.Days) >= 0) + if (newAppModel.IsInRange(DateTime.Today, this.span)) { this.Model.Appointments.Add(newAppModel); } diff --git a/CampusAppWP8/CampusAppWP8/Model/TimeTable/AppointmentModel.cs b/CampusAppWP8/CampusAppWP8/Model/TimeTable/AppointmentModel.cs index bc731c58..912fab57 100644 --- a/CampusAppWP8/CampusAppWP8/Model/TimeTable/AppointmentModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/TimeTable/AppointmentModel.cs @@ -101,6 +101,23 @@ namespace CampusAppWP8.Model.TimeTable return retValue; } + /// Query if 'date' is in range. + /// Fiedler, 11.11.2013. + /// The date Date/Time. + /// The span. + /// true if in range, false if not. + public bool IsInRange(DateTime date, TimeSpan span) + { + bool retValue = false; + + if ((this.Start.Subtract(date) <= span) || (this.End.Subtract(date) <= span)) + { + retValue = true; + } + + return retValue; + } + /// Intersects the given model. /// Fiedler, 06.11.2013. /// The model.