diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/info_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/info_159.png index 1ad39f71..f95a93ca 100644 Binary files a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/info_159.png and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/info_159.png differ diff --git a/CampusAppWP8/CampusAppWP8/Model/Mensa/MealModel.cs b/CampusAppWP8/CampusAppWP8/Model/Mensa/MealModel.cs index 4a6d2e8a..4f59203d 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Mensa/MealModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Mensa/MealModel.cs @@ -9,6 +9,7 @@ namespace CampusAppWP8.Model.Mensa { using System.Xml.Serialization; using CampusAppWP8.Resources; + using CampusAppWP8.Utility; /// /// Model for a meal @@ -20,7 +21,7 @@ namespace CampusAppWP8.Model.Mensa /// /// Constant for the vegetarian icon /// - private const string MealIconNameVegetarian = "CAROTTE"; + private const string MealIconNameVegetarian = "CARROTTE"; /// /// Constant for the free icon @@ -110,7 +111,7 @@ namespace CampusAppWP8.Model.Mensa set { - if (value != this.mealId && value > -1 && value < 8) + if (value > -1 && value < 8) { this.mealId = value; this.CreateMealName(); @@ -176,7 +177,7 @@ namespace CampusAppWP8.Model.Mensa { if (value != this.mealDesc) { - this.mealDesc = value; + this.mealDesc = StringManager.StripHTML(value); } } } diff --git a/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuModel.cs b/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuModel.cs index 06d3aa34..0d898992 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuModel.cs @@ -11,6 +11,8 @@ namespace CampusAppWP8.Model.Mensa using System.Xml.Serialization; using CampusAppWP8.Resources; using CampusAppWP8.Utility; + using System.Collections.ObjectModel; + using System.Globalization; /// /// Model for menu @@ -57,7 +59,7 @@ namespace CampusAppWP8.Model.Mensa /// /// DateTime of the day /// - private DateTime date; + private string date; /// /// DateTime of the monday @@ -80,10 +82,16 @@ namespace CampusAppWP8.Model.Mensa #region Property + /// + /// Gets or sets the menus for the week + /// + [XmlElement("Meal")] + public ObservableCollection Meals { get; set; } + /// /// Gets or sets the WeekDay /// - [XmlElement("Wochentag")] + [XmlAttribute("day")] public string Day { get @@ -93,19 +101,22 @@ namespace CampusAppWP8.Model.Mensa set { - this.SetValue(value, ref this.dayName); - this.CalcDateOfDay(); + if (value != this.dayName) + { + this.dayName = value; + } } } /// /// Gets or sets of Date /// - public DateTime Date + [XmlAttribute("date")] + public string Date { get { - return this.date; + return this.date.ToString(); } set @@ -117,153 +128,6 @@ namespace CampusAppWP8.Model.Mensa } } - /// - /// Gets or sets dinner 1 - /// - [XmlElement("Essen1")] - public string Dinner1 - { - get - { - return this.dinner1; - } - - set - { - this.SetValue(value, ref this.dinner1); - } - } - - /// - /// Gets or sets dinner 2 - /// - [XmlElement("Essen2")] - public string Dinner2 - { - get - { - return this.dinner2; - } - - set - { - this.SetValue(value, ref this.dinner2); - } - } - - /// - /// Gets or sets dinner 3 - /// - [XmlElement("Essen3")] - public string Dinner3 - { - get - { - return this.dinner3; - } - - set - { - this.SetValue(value, ref this.dinner3); - } - } - - /// - /// Gets or sets dinner 4 - /// - [XmlElement("Essen4")] - public string Dinner4 - { - get - { - return this.dinner4; - } - - set - { - this.SetValue(value, ref this.dinner4); - } - } - - /// - /// Gets or sets dinner bio - /// - [XmlElement("Bio")] - public string Bio - { - get - { - return this.bio; - } - - set - { - this.SetValue(value, ref this.bio); - } - } - - /// - /// Gets or sets dinner action - /// - [XmlElement("Aktionstag")] - public string Action - { - get - { - return this.action; - } - - set - { - this.SetValue(value, ref this.action); - } - } - - #endregion - - #region Method - - /// - /// Methods sets the property - /// - /// maybe move to base class - /// new property value - /// name of the property - private void SetValue(string value, ref string property) - { - if (value != null && !string.Empty.Equals(value) && !value.Equals(property)) - { - property = StringManager.StripHTML(value); - } - } - - /// - /// Method calculate the DateTime of the MenuDay - /// - private void CalcDateOfDay() - { - switch (this.dayName) - { - case "Montag": - this.date = this.monday; - break; - case "Diensttag": - this.date = this.monday.AddDays(1); - break; - case "Mittwoch": - this.date = this.monday.AddDays(2); - break; - case "Donnerstag": - this.date = this.monday.AddDays(3); - break; - case "Freitag": - this.date = this.monday.AddDays(4); - break; - default: - this.date = this.monday; - break; - } - } #endregion } } diff --git a/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuWeekModel.cs b/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuWeekModel.cs index de26c237..1451075b 100644 --- a/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuWeekModel.cs +++ b/CampusAppWP8/CampusAppWP8/Model/Mensa/MenuWeekModel.cs @@ -42,8 +42,8 @@ namespace CampusAppWP8.Model.Mensa /// /// Gets or sets the menus for the week /// - [XmlArray("BTU")] - [XmlArrayItem("Tagesmenu")] + [XmlArray("Mealplan")] + [XmlArrayItem("Menu")] public ObservableCollection Menus { get; set; } /// diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml index d3813f39..b663f264 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml @@ -19,127 +19,47 @@ - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs index 18bd2c01..46d5f76d 100644 --- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs +++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs @@ -34,6 +34,11 @@ namespace CampusAppWP8.Pages.Mensa /// private int selectedIndex; + /// + /// Flag indicate that the feed was refreshed + /// + private bool refreshed = false; + #endregion #region Constructor @@ -75,7 +80,7 @@ namespace CampusAppWP8.Pages.Mensa /// Arguments of navigation protected override void OnNavigatedFrom(NavigationEventArgs e) { - this.feed.SaveData(); + this.feed.SaveData(this.refreshed); } #endregion @@ -151,6 +156,7 @@ namespace CampusAppWP8.Pages.Mensa { this.ProgressBar.Visibility = System.Windows.Visibility.Visible; this.feed.ForceWebUpdate(); + this.refreshed = true; } #endregion diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs index 7520cb92..1b6ef17d 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs @@ -628,7 +628,7 @@ namespace CampusAppWP8.Resources { } /// - /// Sucht eine lokalisierte Zeichenfolge, die http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/ ähnelt. + /// Sucht eine lokalisierte Zeichenfolge, die http://www.tu-cottbus.de/campusapp-data/Studentenwerk/index.php?mensa=CottbusBTU&v=1 ähnelt. /// public static string UrlMensa_Week { get { diff --git a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx index adcdb9f9..8520e922 100644 --- a/CampusAppWP8/CampusAppWP8/Resources/Constants.resx +++ b/CampusAppWP8/CampusAppWP8/Resources/Constants.resx @@ -256,7 +256,7 @@ EventsFeed.xml - http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/ + http://www.tu-cottbus.de/campusapp-data/Studentenwerk/index.php?mensa=CottbusBTU&v=1 OpeninghoursFeed.xml