diff --git a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs
index ef3405ee..2386beb0 100644
--- a/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs
+++ b/CampusAppWP8/CampusAppWP8/Feed/Mensa/MensaFeed.cs
@@ -11,11 +11,14 @@ namespace CampusAppWP8.Api.Mensa
using System.Collections.ObjectModel;
using CampusAppWP8.Model.Mensa;
using CampusAppWP8.Utility;
+ using CampusAppWP8.Model;
+ using CampusAppWP8.Resources;
+ using System.IO;
///
/// This Class is for MensaFeeds
///
- public class MensaFeed : XmlFeed
+ public class MensaFeed : XmlModel
{
#region Constructor
@@ -23,8 +26,10 @@ namespace CampusAppWP8.Api.Mensa
/// Initializes a new instance of the class.
///
public MensaFeed()
- : base(URLList.MensaFeedURL, FileList.MensaXmlFile)
+ : base(ModelType.FileAndFeed, Constants.FileMensa_Shedule, Constants.UrlMensa_Week)
{
+ this.isFileUpToDate += new IsFileUpToDate(this.CheckIsFileUpToDate);
+ this.isModelUpToDate += new IsModelUpToDate(this.CheckIsModelUpToDate);
}
#endregion
@@ -37,9 +42,13 @@ namespace CampusAppWP8.Api.Mensa
/// Method implement CheckIsModelUpToDate()-Method
///
/// true, if model is up-to-date, otherwise false
- protected override bool CheckIsModelUpToDate()
+ private bool CheckIsModelUpToDate(MenuWeekModel model)
{
- DateTime lastModified = this.Model.CreateTime;
+ if (model == null)
+ {
+ return false;
+ }
+ DateTime lastModified = model.CreateTime;
return this.CheckIsUpToDate(lastModified);
}
@@ -47,9 +56,9 @@ namespace CampusAppWP8.Api.Mensa
/// Method implement CheckIsFileUpToDate()-Method
///
/// true, if file is up-to-date, otherwise false
- protected override bool CheckIsFileUpToDate()
+ private bool CheckIsFileUpToDate(MenuWeekModel model, FileInfo fileInfo)
{
- DateTime lastModified = FileManager.GetFileInfo(FileName).LastWriteTime;
+ DateTime lastModified = fileInfo.LastWriteTime;
return this.CheckIsUpToDate(lastModified);
}
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
index ca2cce6d..2d193a50 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs
@@ -96,6 +96,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die MensaFeed.xml ähnelt.
+ ///
+ public static string FileMensa_Shedule {
+ get {
+ return ResourceManager.GetString("FileMensa_Shedule", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die StudentCouncils.xml ähnelt.
///
@@ -106,7 +115,7 @@ namespace CampusAppWP8.Resources {
}
///
- /// Sucht eine lokalisierte Zeichenfolge, die ähnelt.
+ /// Sucht eine lokalisierte Zeichenfolge, die IsolatedStorage_DepartmentFavoriteModel ähnelt.
///
public static string IsolatedStorage_DepartmentFavoriteModel {
get {
@@ -141,15 +150,6 @@ namespace CampusAppWP8.Resources {
}
}
- ///
- /// Sucht eine lokalisierte Zeichenfolge, die ähnelt.
- ///
- public static string LinkApp_CommonLinks {
- get {
- return ResourceManager.GetString("LinkApp_CommonLinks", resourceCulture);
- }
- }
-
///
/// Sucht eine lokalisierte Zeichenfolge, die Studiengang ähnelt.
///
@@ -438,6 +438,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/ ähnelt.
+ ///
+ public static string UrlMensa_Week {
+ get {
+ return ResourceManager.GetString("UrlMensa_Week", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die http://www.tu-cottbus.de/campusapp-data/getdata.php?db=studentcouncils&app=2&appversion=1 ähnelt.
///
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
index 3a6c8ba2..d0190478 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx
@@ -190,7 +190,7 @@
/Pages/Openinghours/OpeninghoursPage.xaml
-
+ IsolatedStorage_DepartmentFavoriteModel
DepartmentFavoriteFeed.xml
@@ -249,7 +249,10 @@
http://www.tu-cottbus.de/campusapp-data/getdata.php?db=studentcouncils&app=2&appversion=1
-
-
+
+ MensaFeed.xml
+
+
+ http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/NavigateButton.cs b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/NavigateButton.cs
index 147921b0..2f0a02a5 100644
--- a/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/NavigateButton.cs
+++ b/CampusAppWP8/CampusAppWP8/Utility/Lui/Button/NavigateButton.cs
@@ -24,12 +24,12 @@ namespace CampusAppWP8.Utility.Lui.Button
public static readonly DependencyProperty NavigateProperty = DependencyProperty.Register("Url", typeof(object), typeof(NavigateButton), new PropertyMetadata(false));
///
- /// Register the QuerryValueProperty
+ /// Register the QueryValueProperty
///
public static readonly DependencyProperty QueryValueProperty = DependencyProperty.Register("QuerryStringValue", typeof(object), typeof(NavigateButton), new PropertyMetadata(false));
///
- /// Register the QuerryNameProperty
+ /// Register the QueryNameProperty
///
public static readonly DependencyProperty QueryNameProperty = DependencyProperty.Register("QuerryStringName", typeof(object), typeof(NavigateButton), new PropertyMetadata(false));
@@ -59,7 +59,7 @@ namespace CampusAppWP8.Utility.Lui.Button
}
///
- /// Gets or sets the QuerryStringName
+ /// Gets or sets the QueryStringName
///
public object QuerryStringName
{
@@ -68,7 +68,7 @@ namespace CampusAppWP8.Utility.Lui.Button
}
///
- /// Gets or sets the QuerryStringValue
+ /// Gets or sets the QueryStringValue
///
public object QuerryStringValue
{
diff --git a/CampusAppWP8/CampusAppWP8/model/MainModel.cs b/CampusAppWP8/CampusAppWP8/model/MainModel.cs
index e3a5617f..d2346440 100644
--- a/CampusAppWP8/CampusAppWP8/model/MainModel.cs
+++ b/CampusAppWP8/CampusAppWP8/model/MainModel.cs
@@ -67,7 +67,7 @@ namespace CampusAppWP8
this.fileName = fileName;
if ((this.IsFile() == true)
- && (fileName.Equals(string.Empty) == false))
+ && (fileName.Equals(string.Empty) == false))
{
this.InitFile(CampusAppWP8.Utility.File.IOTypeRead.ReadSync, CampusAppWP8.Utility.File.IOTypeWrite.WriteAsync);
}
diff --git a/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml b/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml
index a2857099..f78cc114 100644
--- a/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/pages/StartPage.xaml
@@ -88,7 +88,7 @@
-
+
diff --git a/CampusAppWP8/CampusAppWP8/pages/mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/pages/mensa/MensaPage.xaml.cs
index 9239ebdf..7dfa87a9 100644
--- a/CampusAppWP8/CampusAppWP8/pages/mensa/MensaPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/pages/mensa/MensaPage.xaml.cs
@@ -66,7 +66,7 @@ namespace CampusAppWP8.Pages.Mensa
this.InitializeFeed();
}
this.ProgressBar.Visibility = System.Windows.Visibility.Visible;
- this.feed.LoadFeed();
+ this.feed.LoadData();
}
#endregion
#region private
@@ -77,7 +77,7 @@ namespace CampusAppWP8.Pages.Mensa
private void InitializeFeed()
{
this.feed = new MensaFeed();
- this.feed.EventHandler.FeedIsReadyEvent += new FeedEventHandler.FeedReadyHandler(this.FeedIsReady);
+ this.feed.onLoaded += new MensaFeed.OnLoaded(this.FeedIsReady);
this.CalcSelectedIndex();
}
diff --git a/CampusAppWP8/CampusAppWP8/utility/FileList.cs b/CampusAppWP8/CampusAppWP8/utility/FileList.cs
index 18f5b3f1..a080bd08 100644
--- a/CampusAppWP8/CampusAppWP8/utility/FileList.cs
+++ b/CampusAppWP8/CampusAppWP8/utility/FileList.cs
@@ -18,7 +18,7 @@ namespace CampusAppWP8.Utility
///
/// Name of the file for the feed of the mensa.
///
- public static readonly string MensaXmlFile = "MesaFeed.xml";
+ public static readonly string MensaXmlFile = "MensaFeed.xml";
///
/// Opening hours feed file name.