From 39f70beab7091bbffcc1f0c82cda7381c0047a45 Mon Sep 17 00:00:00 2001
From: Christian Fiedler <fiedlchr@tu-cottbus.de>
Date: Mon, 11 Nov 2013 17:46:20 +0100
Subject: [PATCH] TimeSpan-from-ToDay relative loading

---
 .../Feed/TimeTable/AppointmentFeed.cs           |  2 +-
 .../Model/TimeTable/AppointmentModel.cs         | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

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;
         }
 
+        /// <summary> Query if 'date' is in range. </summary>
+        /// <remarks> Fiedler, 11.11.2013. </remarks>
+        /// <param name="date"> The date Date/Time. </param>
+        /// <param name="span"> The span. </param>
+        /// <returns> true if in range, false if not. </returns>
+        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;
+        }
+
         /// <summary> Intersects the given model. </summary>
         /// <remarks> Fiedler, 06.11.2013. </remarks>
         /// <param name="model"> The model. </param>