diff --git a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml
index 66530d29..cdc12571 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Exams/Exams.xaml
@@ -21,9 +21,9 @@
-
-
+
+
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml
index 8bc60007..abb8ac14 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Links/LinkPage.xaml
@@ -22,9 +22,9 @@
-
-
+
+
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml
index 2cbda005..3472e14e 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml
@@ -7,20 +7,30 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:lui="clr-namespace:CampusAppWP8.Utility.Lui.Button"
+ xmlns:header="clr-namespace:CampusAppWP8.Utility.Lui.Header"
mc:Ignorable="d"
FontFamily="{StaticResource PhoneFontFamilyNormal}"
FontSize="{StaticResource PhoneFontSizeNormal}"
Foreground="{StaticResource PhoneForegroundBrush}"
SupportedOrientations="PortraitOrLandscape" Orientation="Portrait"
+ OrientationChanged="PhoneApplicationPage_OrientationChanged"
shell:SystemTray.IsVisible="True">
-
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -28,7 +38,7 @@
-
+
@@ -38,12 +48,12 @@
-
-
+
+
-
+
@@ -51,12 +61,10 @@
-
-
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
index d13c3525..f061b5af 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
@@ -230,8 +230,10 @@ namespace CampusAppWP8.Pages.Mensa
///
private void SetupMensaPivot()
{
- this.MensaPivot.Title = AppResources.MensaApp_Title + " (" + this.feed.Title + ")";
+ this.Header.HeaderName = AppResources.MensaApp_Title + ": " + this.feed.Title;
this.CreatesMealIcons();
+ this.feed.Model.Menus[2].Meals = null;
+ this.feed.Model.SetHolidayCaption(AppResources.MensaApp_CloseMensa);
this.MensaPivot.ItemsSource = this.feed.Model.Menus;
this.MensaPivot.SelectedIndex = this.selectedIndex;
}
@@ -358,6 +360,23 @@ namespace CampusAppWP8.Pages.Mensa
this.InitializeFeed(CampusAppWPortalLib8.Model.Settings.Campus.SFB_MAIN);
}
+ ///
+ /// Method handle OrientationPage
+ ///
+ /// Caller of the function
+ /// some EventArgs
+ private void PhoneApplicationPage_OrientationChanged(object sender, OrientationChangedEventArgs e)
+ {
+ if (this.Orientation == PageOrientation.LandscapeLeft || this.Orientation == PageOrientation.LandscapeRight)
+ {
+ ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Default;
+ }
+ else
+ {
+ ApplicationBar.Mode = Microsoft.Phone.Shell.ApplicationBarMode.Minimized;
+ }
+ }
+
#endregion
#endregion
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml
index 7564bfa0..9f99be66 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Person/PersonPage.xaml
@@ -24,8 +24,8 @@
-
+
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml
index 69874c2e..2a392a27 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml
@@ -24,8 +24,8 @@
-
+
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
index 3a118d49..895d0ace 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs
@@ -456,6 +456,15 @@ namespace CampusAppWP8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die Die Mensa ist heute geschlossen ähnelt.
+ ///
+ public static string MensaApp_CloseMensa {
+ get {
+ return ResourceManager.GetString("MensaApp_CloseMensa", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die 84 ähnelt.
///
diff --git a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
index bdac3a8f..6a10e787 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
@@ -437,4 +437,7 @@
Type
+
+ Die Mensa ist heute geschlossen
+
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs
index 51d6c551..80a239f1 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs
@@ -101,7 +101,7 @@ namespace CampusAppWPortalLib8.Model.Mensa
set
{
- if (value > -1 && value < 8)
+ if (value > -2 && value < 8)
{
this.mealId = value;
this.CreateMealName();
@@ -187,7 +187,7 @@ namespace CampusAppWPortalLib8.Model.Mensa
this.mealName = AppResources.MensaApp_Action;
break;
default:
- this.mealName = string.Empty;
+ this.mealName = AppResources.MensaApp_NoFood;
break;
}
}
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MenuWeekModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MenuWeekModel.cs
index 0af57379..35338718 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MenuWeekModel.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MenuWeekModel.cs
@@ -77,6 +77,29 @@ namespace CampusAppWPortalLib8.Model.Mensa
return monday;
}
+ ///
+ /// Method determine holidays (Days with no meals) and add a pseudo meal
+ ///
+ /// text of the pseudo meal
+ public void SetHolidayCaption(string text)
+ {
+ MealModel holiday = new MealModel();
+ holiday.MealDesc = text;
+ holiday.MealId= -1;
+
+ foreach (MenuModel menu in this.Menus)
+ {
+ if (menu.Meals == null || menu.Meals.Count < 1)
+ {
+ if (menu.Meals == null)
+ {
+ menu.Meals = new ObservableCollection();
+ }
+ menu.Meals.Add(holiday);
+ }
+ }
+ }
+
#endregion
}
}
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs
index fe2e04e7..0da18b19 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.Designer.cs
@@ -62,7 +62,7 @@ namespace CampusAppWPortalLib8.Resources {
}
///
- /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Hauptcampus ähnelt.
+ /// Sucht eine lokalisierte Zeichenfolge, die Cottbus Campus ähnelt.
///
public static string Campus_CBMain {
get {
@@ -89,7 +89,7 @@ namespace CampusAppWPortalLib8.Resources {
}
///
- /// Sucht eine lokalisierte Zeichenfolge, die Senftenberg Hauptcampus ähnelt.
+ /// Sucht eine lokalisierte Zeichenfolge, die Senftenberg Campus ähnelt.
///
public static string Campus_SFBMain {
get {
@@ -196,6 +196,15 @@ namespace CampusAppWPortalLib8.Resources {
}
}
+ ///
+ /// Sucht eine lokalisierte Zeichenfolge, die Kein Essen ähnelt.
+ ///
+ public static string MensaApp_NoFood {
+ get {
+ return ResourceManager.GetString("MensaApp_NoFood", resourceCulture);
+ }
+ }
+
///
/// Sucht eine lokalisierte Zeichenfolge, die Suppe ähnelt.
///
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx
index 51ef3544..cf4cd79d 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx
+++ b/CampusAppWP8/CampusAppWPortalLib8/Resources/AppResources.resx
@@ -118,7 +118,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Cottbus Hauptcampus
+ Cottbus Campus
Cottbus Nordcampus
@@ -127,7 +127,7 @@
Cottbus Südcampus
- Senftenberg Hauptcampus
+ Senftenberg Campus
Bachelor
@@ -162,6 +162,9 @@
Essen 5
+
+ Kein Essen
+
Suppe