stubbfel/win8phoneApp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release/r#138#139' into develmaster

Browse Source
This commit is contained in:
stubbfel
2013-08-06 14:53:31 +02:00
parent 4652b82885 a99ff5526c
commit 2606e089df
14 changed files with 546 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/info_159.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

1
CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
View File

@@ -99,6 +99,7 @@
<Compile Include="Feed\Departments\DepartmentFavoriteFeed.cs" />
<Compile Include="Const.cs" />
<Compile Include="File\Setting\UserProfilFile.cs" />
<Compile Include="Model\Mensa\MealModel.cs" />
<Compile Include="Model\Setting\UserProfilModel.cs" />
<Compile Include="Model\Utility\CourseListPickerItemListModel.cs" />
<Compile Include="Model\Utility\DegreeListPickerItemListModel.cs" />

268
CampusAppWP8/CampusAppWP8/Model/Mensa/MealModel.cs Normal file
View File

@@ -0,0 +1,268 @@
//-----------------------------------------------------------------------
// <copyright file="MealModel.cs" company="BTU/IIT">
// Company copyright tag.
// </copyright>
// <author>stubbfel</author>
// <sience>06.08.2013</sience>
//----------------------------------------------------------------------
namespace CampusAppWP8.Model.Mensa
{
using System.Xml.Serialization;
using CampusAppWP8.Resources;
using CampusAppWP8.Utility;
/// <summary>
/// Model for a meal
/// </summary>
public class MealModel
{
#region Members
/// <summary>
/// Constant for the vegetarian icon
/// </summary>
private const string MealIconNameVegetarian = "CARROTTE";
/// <summary>
/// Constant for the free icon
/// </summary>
private const string MealIconNameFree = "FREI";
/// <summary>
/// Constant for the pig icon
/// </summary>
private const string MealIconNamePig = "SCHWEIN";
/// <summary>
/// Constant for the cow icon
/// </summary>
private const string MealIconNameCow = "RIND";
/// <summary>
/// Constant for the fowl icon
/// </summary>
private const string MealIconNameFowl = "GEFL";
/// <summary>
/// Constant for the cow-pig icon
/// </summary>
private const string MealIconNameCowPig = "RINDSCHWEIN";
/// <summary>
/// Constant for the fish icon
/// </summary>
private const string MealIconNameFish = "FISCH";
/// <summary>
/// Constant for the wild icon
/// </summary>
private const string MealIconNameWild = "WILD";
/// <summary>
/// Constant for the lamb icon
/// </summary>
private const string MealIconNameLamb = "LAMM";
/// <summary>
/// Variable for the id of the meal
/// </summary>
/// <remarks>
/// ValueRange : 0 - 7
/// </remarks>
private int mealId;
/// <summary>
/// Name of the meal
/// </summary>
private string mealName;
/// <summary>
/// Name of the icon
/// </summary>
private string iconName;
/// <summary>
/// Url of the icon
/// </summary>
private string iconUrl;
/// <summary>
/// Description of the meal
/// </summary>
private string mealDesc;
#endregion
#region Proberty
/// <summary>
/// Gets or sets the mealId
/// </summary>
/// <remarks>
/// ValueRange : 0 - 7
/// </remarks>
[XmlAttribute("id")]
public int MealId
{
get
{
return this.mealId;
}
set
{
if (value > -1 && value < 8)
{
this.mealId = value;
this.CreateMealName();
}
}
}
/// <summary>
/// Gets the mealName
/// </summary>
public string MealName
{
get
{
return this.mealName;
}
}
/// <summary>
/// Gets or sets the iconName
/// </summary>
[XmlAttribute("icon")]
public string IconName
{
get
{
return this.iconName;
}
set
{
if (value != this.iconName)
{
this.iconName = value;
this.CreateIconUrl();
}
}
}
/// <summary>
/// Gets the iconUrl
/// </summary>
public string IconUrl
{
get
{
return this.iconUrl;
}
}
/// <summary>
/// Gets or sets the mealDescription
/// </summary>
[XmlAttribute("desc")]
public string MealDesc
{
get
{
return this.mealDesc;
}
set
{
if (value != this.mealDesc)
{
this.mealDesc = StringManager.StripHTML(value);
}
}
}
#endregion
#region Methods
/// <summary>
/// Method create depends of the mealId the mealName
/// </summary>
private void CreateMealName()
{
switch (this.mealId)
{
case 0:
this.mealName = AppResources.MensaApp_Soup;
break;
case 1:
this.mealName = AppResources.MensaApp_Dinner1;
break;
case 2:
this.mealName = AppResources.MensaApp_Dinner2;
break;
case 3:
this.mealName = AppResources.MensaApp_Dinner3;
break;
case 4:
this.mealName = AppResources.MensaApp_Dinner4;
break;
case 5:
this.mealName = AppResources.MensaApp_Dinner5;
break;
case 6:
this.mealName = AppResources.MensaApp_Bio;
break;
case 7:
this.mealName = AppResources.MensaApp_Action;
break;
default:
this.mealName = string.Empty;
break;
}
}
/// <summary>
/// Method create depends of the iconUrl the iconName
/// </summary>
private void CreateIconUrl()
{
switch (this.iconName)
{
case MealModel.MealIconNameVegetarian:
this.iconUrl = Icons.Info;
break;
case MealModel.MealIconNameFree:
this.iconUrl = Icons.Info;
break;
case MealModel.MealIconNameCowPig:
this.iconUrl = Icons.Info;
break;
case MealModel.MealIconNameFish:
this.iconUrl = Icons.Info;
break;
case MealModel.MealIconNameFowl:
this.iconUrl = Icons.Info;
break;
case MealModel.MealIconNameLamb:
this.iconUrl = Icons.Info;
break;
case MealModel.MealIconNamePig:
this.iconUrl = Icons.Info;
break;
case MealModel.MealIconNameWild:
this.iconUrl = Icons.Info;
break;
case MealModel.MealIconNameCow:
this.iconUrl = Icons.Info;
break;
default:
this.iconUrl = string.Empty;
break;
}
}
#endregion
}
}

200
CampusAppWP8/CampusAppWP8/Model/Mensa/MenuModel.cs
View File

@@ -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;
/// <summary>
/// Model for menu
@@ -19,36 +21,6 @@ namespace CampusAppWP8.Model.Mensa
{
#region Member
/// <summary>
/// Name for bio dinner
/// </summary>
private string bio = AppResources.MensaApp_NotToday;
/// <summary>
/// Name for 1. dinner
/// </summary>
private string dinner1 = AppResources.MensaApp_NotToday;
/// <summary>
/// Name for 2. dinner
/// </summary>
private string dinner2 = AppResources.MensaApp_NotToday;
/// <summary>
/// Name for 3. dinner
/// </summary>
private string dinner3 = AppResources.MensaApp_NotToday;
/// <summary>
/// Name for 4. dinner
/// </summary>
private string dinner4 = AppResources.MensaApp_NotToday;
/// <summary>
/// Name for action dinner
/// </summary>
private string action = AppResources.MensaApp_NotToday;
/// <summary>
/// Name of the day
/// </summary>
@@ -57,7 +29,7 @@ namespace CampusAppWP8.Model.Mensa
/// <summary>
/// DateTime of the day
/// </summary>
private DateTime date;
private string date;
/// <summary>
/// DateTime of the monday
@@ -80,10 +52,16 @@ namespace CampusAppWP8.Model.Mensa
#region Property
/// <summary>
/// Gets or sets the menus for the week
/// </summary>
[XmlElement("Meal")]
public ObservableCollection<MealModel> Meals { get; set; }
/// <summary>
/// Gets or sets the WeekDay
/// </summary>
[XmlElement("Wochentag")]
[XmlAttribute("day")]
public string Day
{
get
@@ -93,19 +71,22 @@ namespace CampusAppWP8.Model.Mensa
set
{
this.SetValue(value, ref this.dayName);
this.CalcDateOfDay();
if (value != this.dayName)
{
this.dayName = value;
}
}
}
/// <summary>
/// Gets or sets of Date
/// </summary>
public DateTime Date
[XmlAttribute("date")]
public string Date
{
get
{
return this.date;
return this.date.ToString();
}
set
@@ -117,153 +98,6 @@ namespace CampusAppWP8.Model.Mensa
}
}
/// <summary>
/// Gets or sets dinner 1
/// </summary>
[XmlElement("Essen1")]
public string Dinner1
{
get
{
return this.dinner1;
}
set
{
this.SetValue(value, ref this.dinner1);
}
}
/// <summary>
/// Gets or sets dinner 2
/// </summary>
[XmlElement("Essen2")]
public string Dinner2
{
get
{
return this.dinner2;
}
set
{
this.SetValue(value, ref this.dinner2);
}
}
/// <summary>
/// Gets or sets dinner 3
/// </summary>
[XmlElement("Essen3")]
public string Dinner3
{
get
{
return this.dinner3;
}
set
{
this.SetValue(value, ref this.dinner3);
}
}
/// <summary>
/// Gets or sets dinner 4
/// </summary>
[XmlElement("Essen4")]
public string Dinner4
{
get
{
return this.dinner4;
}
set
{
this.SetValue(value, ref this.dinner4);
}
}
/// <summary>
/// Gets or sets dinner bio
/// </summary>
[XmlElement("Bio")]
public string Bio
{
get
{
return this.bio;
}
set
{
this.SetValue(value, ref this.bio);
}
}
/// <summary>
/// Gets or sets dinner action
/// </summary>
[XmlElement("Aktionstag")]
public string Action
{
get
{
return this.action;
}
set
{
this.SetValue(value, ref this.action);
}
}
#endregion
#region Method
/// <summary>
/// Methods sets the property
/// </summary>
/// <remarks> maybe move to base class</remarks>
/// <param name="value">new property value</param>
/// <param name="property">name of the property</param>
private void SetValue(string value, ref string property)
{
if (value != null && !string.Empty.Equals(value) && !value.Equals(property))
{
property = StringManager.StripHTML(value);
}
}
/// <summary>
/// Method calculate the DateTime of the MenuDay
/// </summary>
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
}
}

13
CampusAppWP8/CampusAppWP8/Model/Mensa/MenuWeekModel.cs
View File

@@ -22,7 +22,11 @@ namespace CampusAppWP8.Model.Mensa
/// Time when the model was created
/// </summary>
private readonly DateTime createTime;
#endregion
#region Constructor
/// <summary>
/// Initializes a new instance of the <see cref="MenuWeekModel" /> class.
/// </summary>
@@ -33,18 +37,15 @@ namespace CampusAppWP8.Model.Mensa
#endregion
#region Constructor
#region Proberty
/// <summary>
/// Gets or sets the menus for the week
/// </summary>
[XmlArray("BTU")]
[XmlArrayItem("Tagesmenu")]
[XmlArray("Mealplan")]
[XmlArrayItem("Menu")]
public ObservableCollection<MenuModel> Menus { get; set; }
#endregion
#region Proberty
/// <summary>
/// Gets the creation time of the model
/// </summary>

10
CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml
View File

@@ -55,7 +55,7 @@
<StackPanel >
<TextBlock Text="{Binding Path=LocalizedResources.LectureApp_Course, Source={StaticResource LocalizedStrings}}"/>
<!-- Listpicket of courses -->
<toolkit:ListPicker Name="Course" ExpansionMode="FullScreenOnly" FullModeHeader="{Binding Path=LocalizedResources.LectureApp_ListPickerHeaderCourse, Source={StaticResource LocalizedStrings}}" >
<toolkit:ListPicker Name="Course" ExpansionMode="FullScreenOnly" FullModeHeader="{Binding Path=LocalizedResources.ListPickerHeaderCourse, Source={StaticResource LocalizedStrings}}" >
<toolkit:ListPicker.ItemTemplate>
<DataTemplate>
<StackPanel>
@@ -77,7 +77,7 @@
<StackPanel >
<!-- Listpicket of degree-->
<TextBlock Text="{Binding Path=LocalizedResources.LectureApp_Degree, Source={StaticResource LocalizedStrings}}"/>
<toolkit:ListPicker Name="Degree" ExpansionMode="FullScreenOnly" SelectionChanged="DegreeSelectionChanged">
<toolkit:ListPicker Name="Degree" ExpansionMode="FullScreenOnly" SelectionChanged="DegreeSelectionChanged" FullModeHeader="{Binding Path=LocalizedResources.ListPickerHeaderDegree, Source={StaticResource LocalizedStrings}}">
<toolkit:ListPicker.ItemTemplate>
<DataTemplate>
<StackPanel>
@@ -100,7 +100,7 @@
<!-- Listpicket of semesters(from to) -->
<TextBlock Text="{Binding Path=LocalizedResources.LectureApp_Term, Source={StaticResource LocalizedStrings}}"/>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<toolkit:ListPicker Width="60" Name="From" ExpansionMode="FullScreenOnly" SelectionChanged="FromSelectionChanged">
<toolkit:ListPicker Width="60" Name="From" ExpansionMode="FullScreenOnly" SelectionChanged="FromSelectionChanged" FullModeHeader="{Binding Path=LocalizedResources.ListPickerHeaderSemester, Source={StaticResource LocalizedStrings}}">
<toolkit:ListPicker.ItemTemplate>
<DataTemplate>
<StackPanel>
@@ -117,7 +117,7 @@
</toolkit:ListPicker.FullModeItemTemplate>
</toolkit:ListPicker>
<TextBlock Text="bis" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<toolkit:ListPicker Width="60" Name="To" ExpansionMode="FullScreenOnly">
<toolkit:ListPicker Width="60" Name="To" ExpansionMode="FullScreenOnly" FullModeHeader="{Binding Path=LocalizedResources.ListPickerHeaderSemester, Source={StaticResource LocalizedStrings}}">
<toolkit:ListPicker.ItemTemplate>
<DataTemplate>
<StackPanel>
@@ -141,7 +141,7 @@
<StackPanel>
<!-- Listpicket of semster -->
<TextBlock Text="{Binding Path=LocalizedResources.LectureApp_Semester, Source={StaticResource LocalizedStrings}}"/>
<toolkit:ListPicker Name="Semester" ExpansionMode="FullScreenOnly">
<toolkit:ListPicker Name="Semester" ExpansionMode="FullScreenOnly" FullModeHeader="{Binding Path=LocalizedResources.ListPickerHeaderSemester, Source={StaticResource LocalizedStrings}}">
<toolkit:ListPicker.ItemTemplate>
<DataTemplate>
<StackPanel>

134
CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml
View File

@@ -19,127 +19,47 @@
<!--Pivotsteuerelement-->
<phone:Pivot Name="MensaPivot" Title="{Binding Path=LocalizedResources.MensaApp_Title, Source={StaticResource LocalizedStrings}}">
<phone:Pivot.HeaderTemplate>
<DataTemplate>
<StackPanel>
<TextBlock Text="{Binding Day}" />
<TextBlock Text="{Binding Day}" />
<TextBlock Text="{Binding Date}" FontSize="34" Margin="6,0,0,0"/>
</StackPanel>
</DataTemplate>
</phone:Pivot.HeaderTemplate>
<phone:Pivot.ItemTemplate>
<DataTemplate>
<StackPanel Margin="12,0,12,0">
<TextBlock Text="{Binding Date, StringFormat='{}{0:dd.MM.yyyy}'}"/>
<ScrollViewer>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<ScrollViewer>
<ItemsControl x:Name="MenuPanel" ItemsSource="{Binding Meals}" ScrollViewer.VerticalScrollBarVisibility="Auto">
<ItemsControl.ItemTemplate>
<DataTemplate>
<Border Background="{x:Null}" BorderBrush="{StaticResource PhoneInverseInactiveBrush}" BorderThickness="0,1,0,0" Padding="0,12,0,12">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="0" Margin="0,0,0,12" Width="100">
<TextBlock Text="{Binding MealName}" FontWeight="Bold"/>
<TextBlock Text=" : "/>
</StackPanel>
<Image Source="{Binding IconUrl}" Width="100" Margin="-25,-25,-25,-21"></Image>
</StackPanel>
<TextBlock Text="{Binding MealDesc}" TextWrapping="Wrap" Grid.Column="1"/>
</Grid>
</Border>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<!-- Dinner 1 -->
<Border Grid.Row="0" Background="{x:Null}" BorderBrush="{StaticResource PhoneInverseInactiveBrush}" BorderThickness="0,0,0,0" Padding="0,12,0,12">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding Path=LocalizedResources.MensaApp_DinnerLabelW, Source={StaticResource LocalizedStrings}}" />
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" Orientation="Horizontal">
<TextBlock Text="{Binding Path=LocalizedResources.MensaApp_Dinner1, Source={StaticResource LocalizedStrings}}" FontWeight="Bold" />
<TextBlock Text=" : "/>
</StackPanel>
<TextBlock Grid.Column="1" Text="{Binding Dinner1}" TextWrapping="Wrap"/>
</Grid>
</Border>
<!-- Dinner 2 -->
<Border Grid.Row="1" Background="{x:Null}" BorderBrush="{StaticResource PhoneInverseInactiveBrush}" BorderThickness="0,1,0,0" Padding="0,12,0,12">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding Path=LocalizedResources.MensaApp_DinnerLabelW, Source={StaticResource LocalizedStrings}}"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" Orientation="Horizontal">
<TextBlock Text="{Binding Path=LocalizedResources.MensaApp_Dinner2, Source={StaticResource LocalizedStrings}}" FontWeight="Bold" />
<TextBlock Text=" : "/>
</StackPanel>
<TextBlock Grid.Column="1" Text="{Binding Dinner2}" TextWrapping="Wrap"/>
</Grid>
</Border>
<!-- Dinner 3 -->
<Border Grid.Row="2" Background="{x:Null}" BorderBrush="{StaticResource PhoneInverseInactiveBrush}" BorderThickness="0,1,0,0" Padding="0,12,0,12">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding Path=LocalizedResources.MensaApp_DinnerLabelW, Source={StaticResource LocalizedStrings}}"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" Orientation="Horizontal">
<TextBlock Text="{Binding Path=LocalizedResources.MensaApp_Dinner3, Source={StaticResource LocalizedStrings}}" FontWeight="Bold" />
<TextBlock Text=" : "/>
</StackPanel>
<TextBlock Grid.Column="1" Text="{Binding Dinner3}" TextWrapping="Wrap"/>
</Grid>
</Border>
<!-- Dinner 4 -->
<Border Grid.Row="3" Background="{x:Null}" BorderBrush="{StaticResource PhoneInverseInactiveBrush}" BorderThickness="0,1,0,0" Padding="0,12,0,12">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding Path=LocalizedResources.MensaApp_DinnerLabelW, Source={StaticResource LocalizedStrings}}"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" Orientation="Horizontal">
<TextBlock Text="{Binding Path=LocalizedResources.MensaApp_Dinner4, Source={StaticResource LocalizedStrings}}" FontWeight="Bold" />
<TextBlock Text=" : "/>
</StackPanel>
<TextBlock Grid.Column="1" Text="{Binding Dinner4}" TextWrapping="Wrap"/>
</Grid>
</Border>
<!-- Bio-->
<Border Grid.Row="4" Background="{x:Null}" BorderBrush="{StaticResource PhoneInverseInactiveBrush}" BorderThickness="0,1,0,0" Padding="0,12,0,12">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding Path=LocalizedResources.MensaApp_DinnerLabelW, Source={StaticResource LocalizedStrings}}"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" Orientation="Horizontal">
<TextBlock Text="{Binding Path=LocalizedResources.MensaApp_Bio, Source={StaticResource LocalizedStrings}}" FontWeight="Bold" />
<TextBlock Text=" : "/>
</StackPanel>
<TextBlock Grid.Column="1" Text="{Binding Bio}" TextWrapping="Wrap"/>
</Grid>
</Border>
<Border Grid.Row="5" Background="{x:Null}" BorderBrush="{StaticResource PhoneInverseInactiveBrush}" BorderThickness="0,1,0,0" Padding="0,12,0,12">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="{Binding Path=LocalizedResources.MensaApp_DinnerLabelW, Source={StaticResource LocalizedStrings}}"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" Orientation="Horizontal">
<TextBlock Text="{Binding Path=LocalizedResources.MensaApp_Action, Source={StaticResource LocalizedStrings}}" FontWeight="Bold" />
<TextBlock Text=" : "/>
</StackPanel>
<TextBlock Grid.Column="1" Text="{Binding Action}" TextWrapping="Wrap"/>
</Grid>
</Border>
</Grid>
</ScrollViewer>
</StackPanel>
</ScrollViewer>
</DataTemplate>
</phone:Pivot.ItemTemplate>
</phone:Pivot>
<!-- <Image Source="/Assets/AlignmentGrid.png" VerticalAlignment="Top" Height="800" Width="480" Margin="0,-32,0,0" Grid.Row="0" Grid.RowSpan="2" IsHitTestVisible="False" /> -->
</Grid>
<phone:PhoneApplicationPage.ApplicationBar>
<shell:ApplicationBar IsVisible="True" IsMenuEnabled="False" Mode="Minimized" Opacity="1.0" >
<shell:ApplicationBar IsVisible="True" IsMenuEnabled="False" Mode="Minimized" >
<lui:UpdateButtonAppBar Click="MensaForceUpdate_Click"/>
</shell:ApplicationBar>
</phone:PhoneApplicationPage.ApplicationBar>

8
CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
View File

@@ -34,6 +34,11 @@ namespace CampusAppWP8.Pages.Mensa
/// </summary>
private int selectedIndex;
/// <summary>
/// Flag indicate that the feed was refreshed
/// </summary>
private bool refreshed = false;
#endregion
#region Constructor
@@ -75,7 +80,7 @@ namespace CampusAppWP8.Pages.Mensa
/// <param name="e">Arguments of navigation</param>
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

8
CampusAppWP8/CampusAppWP8/Pages/Setting/UserProfil.xaml
View File

@@ -45,7 +45,7 @@
<StackPanel >
<TextBlock Text="{Binding Path=LocalizedResources.Setting_UserCourse, Source={StaticResource LocalizedStrings}}"/>
<!-- Listpicket of courses -->
<toolkit:ListPicker Name="Course" ExpansionMode="FullScreenOnly" FullModeHeader="{Binding Path=LocalizedResources.LectureApp_ListPickerHeaderCourse, Source={StaticResource LocalizedStrings}}" >
<toolkit:ListPicker Name="Course" ExpansionMode="FullScreenOnly" FullModeHeader="{Binding Path=LocalizedResources.ListPickerHeaderCourse, Source={StaticResource LocalizedStrings}}" >
<toolkit:ListPicker.ItemTemplate>
<DataTemplate>
<StackPanel>
@@ -67,7 +67,7 @@
<StackPanel >
<!-- Listpicket of degree-->
<TextBlock Text="{Binding Path=LocalizedResources.Setting_UserDegree, Source={StaticResource LocalizedStrings}}"/>
<toolkit:ListPicker Name="Degree" ExpansionMode="FullScreenOnly">
<toolkit:ListPicker Name="Degree" ExpansionMode="FullScreenOnly" FullModeHeader="{Binding Path=LocalizedResources.ListPickerHeaderDegree, Source={StaticResource LocalizedStrings}}">
<toolkit:ListPicker.ItemTemplate>
<DataTemplate>
<StackPanel>
@@ -89,7 +89,7 @@
<StackPanel >
<TextBlock Text="{Binding Path=LocalizedResources.Setting_UserSemester, Source={StaticResource LocalizedStrings}}"/>
<!-- Listpicket of courses -->
<toolkit:ListPicker Name="Semster" ExpansionMode="FullScreenOnly" FullModeHeader="{Binding Path=LocalizedResources.LectureApp_ListPickerHeaderCourse, Source={StaticResource LocalizedStrings}}" >
<toolkit:ListPicker Name="Semster" ExpansionMode="FullScreenOnly" FullModeHeader="{Binding Path=LocalizedResources.ListPickerHeaderSemester, Source={StaticResource LocalizedStrings}}" >
<toolkit:ListPicker.ItemTemplate>
<DataTemplate>
<StackPanel>
@@ -111,7 +111,7 @@
<StackPanel >
<TextBlock Text="{Binding Path=LocalizedResources.Setting_UserRole, Source={StaticResource LocalizedStrings}}"/>
<!-- Listpicket of courses -->
<toolkit:ListPicker Name="Role" ExpansionMode="FullScreenOnly" FullModeHeader="{Binding Path=LocalizedResources.LectureApp_ListPickerHeaderCourse, Source={StaticResource LocalizedStrings}}" >
<toolkit:ListPicker Name="Role" ExpansionMode="FullScreenOnly" FullModeHeader="{Binding Path=LocalizedResources.ListPickerHeaderRole, Source={StaticResource LocalizedStrings}}" >
<toolkit:ListPicker.ItemTemplate>
<DataTemplate>
<StackPanel>

63
CampusAppWP8/CampusAppWP8/Resources/AppResources.Designer.cs generated
View File

@@ -303,15 +303,6 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Studiengangauswahl ähnelt.
/// </summary>
public static string LectureApp_ListPickerHeaderCourse {
get {
return ResourceManager.GetString("LectureApp_ListPickerHeaderCourse", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Verantwortlicher ähnelt.
/// </summary>
@@ -384,6 +375,42 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Studiengangsauswahl ähnelt.
/// </summary>
public static string ListPickerHeaderCourse {
get {
return ResourceManager.GetString("ListPickerHeaderCourse", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Abschlussauswahl ähnelt.
/// </summary>
public static string ListPickerHeaderDegree {
get {
return ResourceManager.GetString("ListPickerHeaderDegree", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Rollenauswahl ähnelt.
/// </summary>
public static string ListPickerHeaderRole {
get {
return ResourceManager.GetString("ListPickerHeaderRole", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Semesterauswahl ähnelt.
/// </summary>
public static string ListPickerHeaderSemester {
get {
return ResourceManager.GetString("ListPickerHeaderSemester", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Webmail ähnelt.
/// </summary>
@@ -447,6 +474,15 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Essen 5 ähnelt.
/// </summary>
public static string MensaApp_Dinner5 {
get {
return ResourceManager.GetString("MensaApp_Dinner5", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die 84 ähnelt.
/// </summary>
@@ -465,6 +501,15 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Suppe ähnelt.
/// </summary>
public static string MensaApp_Soup {
get {
return ResourceManager.GetString("MensaApp_Soup", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Mensaplan ähnelt.
/// </summary>

21
CampusAppWP8/CampusAppWP8/Resources/AppResources.resx
View File

@@ -269,9 +269,6 @@
<data name="Degree_Master" xml:space="preserve">
<value>Master</value>
</data>
<data name="LectureApp_ListPickerHeaderCourse" xml:space="preserve">
<value>Studiengangauswahl</value>
</data>
<data name="Building" xml:space="preserve">
<value>Gebäude</value>
</data>
@@ -344,4 +341,22 @@
<data name="Setting_RoleStudent" xml:space="preserve">
<value>Student</value>
</data>
<data name="ListPickerHeaderCourse" xml:space="preserve">
<value>Studiengangsauswahl</value>
</data>
<data name="ListPickerHeaderDegree" xml:space="preserve">
<value>Abschlussauswahl</value>
</data>
<data name="ListPickerHeaderRole" xml:space="preserve">
<value>Rollenauswahl</value>
</data>
<data name="ListPickerHeaderSemester" xml:space="preserve">
<value>Semesterauswahl</value>
</data>
<data name="MensaApp_Dinner5" xml:space="preserve">
<value>Essen 5</value>
</data>
<data name="MensaApp_Soup" xml:space="preserve">
<value>Suppe</value>
</data>
</root>

83
CampusAppWP8/CampusAppWP8/Resources/Constants.Designer.cs generated
View File

@@ -222,6 +222,87 @@ namespace CampusAppWP8.Resources {
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die RIND ähnelt.
/// </summary>
public static string MealIconName_Cow {
get {
return ResourceManager.GetString("MealIconName_Cow", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die RINDSCHWEIN ähnelt.
/// </summary>
public static string MealIconName_CowPig {
get {
return ResourceManager.GetString("MealIconName_CowPig", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die FISCH ähnelt.
/// </summary>
public static string MealIconName_Fish {
get {
return ResourceManager.GetString("MealIconName_Fish", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die GEFL ähnelt.
/// </summary>
public static string MealIconName_Fowl {
get {
return ResourceManager.GetString("MealIconName_Fowl", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die FREI ähnelt.
/// </summary>
public static string MealIconName_Free {
get {
return ResourceManager.GetString("MealIconName_Free", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die LAMM ähnelt.
/// </summary>
public static string MealIconName_Lamb {
get {
return ResourceManager.GetString("MealIconName_Lamb", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die SCHWEIN ähnelt.
/// </summary>
public static string MealIconName_Pig {
get {
return ResourceManager.GetString("MealIconName_Pig", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die CAROTTE ähnelt.
/// </summary>
public static string MealIconName_Vegetarian {
get {
return ResourceManager.GetString("MealIconName_Vegetarian", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die WILD ähnelt.
/// </summary>
public static string MealIconName_Wild {
get {
return ResourceManager.GetString("MealIconName_Wild", resourceCulture);
}
}
/// <summary>
/// Sucht eine lokalisierte Zeichenfolge, die Studiengang ähnelt.
/// </summary>
@@ -547,7 +628,7 @@ namespace CampusAppWP8.Resources {
}
/// <summary>
/// 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&amp;v=1 ähnelt.
/// </summary>
public static string UrlMensa_Week {
get {

31
CampusAppWP8/CampusAppWP8/Resources/Constants.resx
View File

@@ -256,7 +256,7 @@
<value>EventsFeed.xml</value>
</data>
<data name="UrlMensa_Week" xml:space="preserve">
<value>http://www.studentenwerk-frankfurt.de/2011/ClassPackage/App_IKMZ_BTU/</value>
<value>http://www.tu-cottbus.de/campusapp-data/Studentenwerk/index.php?mensa=CottbusBTU&amp;v=1</value>
</data>
<data name="FileOpeningHours_OpeningHours" xml:space="preserve">
<value>OpeninghoursFeed.xml</value>
@@ -284,7 +284,7 @@
</data>
<data name="IsolatedStorage_OpeninghoursModel" xml:space="preserve">
<value>IsolatedStorage_OpeninghoursModel</value>
</data>
</data>
<data name="FileProfil_User" xml:space="preserve">
<value>user.xml</value>
</data>
@@ -306,4 +306,31 @@
<data name="Valid_MaxCourseNumber" xml:space="preserve">
<value>999</value>
</data>
<data name="MealIconName_Cow" xml:space="preserve">
<value>RIND</value>
</data>
<data name="MealIconName_CowPig" xml:space="preserve">
<value>RINDSCHWEIN</value>
</data>
<data name="MealIconName_Fish" xml:space="preserve">
<value>FISCH</value>
</data>
<data name="MealIconName_Fowl" xml:space="preserve">
<value>GEFL</value>
</data>
<data name="MealIconName_Free" xml:space="preserve">
<value>FREI</value>
</data>
<data name="MealIconName_Lamb" xml:space="preserve">
<value>LAMM</value>
</data>
<data name="MealIconName_Pig" xml:space="preserve">
<value>SCHWEIN</value>
</data>
<data name="MealIconName_Vegetarian" xml:space="preserve">
<value>CAROTTE</value>
</data>
<data name="MealIconName_Wild" xml:space="preserve">
<value>WILD</value>
</data>
</root>

27
CampusAppWP8/CampusAppWP8/Resources/Icons.resx
View File

@@ -123,6 +123,12 @@
<data name="Campus" xml:space="preserve">
<value>campus_159.png</value>
</data>
<data name="Cow" xml:space="preserve">
<value>info_159.png</value>
</data>
<data name="CowPig" xml:space="preserve">
<value>info_159.png</value>
</data>
<data name="Delete" xml:space="preserve">
<value>delete_159.png</value>
</data>
@@ -132,12 +138,24 @@
<data name="Favorite" xml:space="preserve">
<value>favorite_159.png</value>
</data>
<data name="Fish" xml:space="preserve">
<value>info_159.png</value>
</data>
<data name="Fowl" xml:space="preserve">
<value>info_159.png</value>
</data>
<data name="Free" xml:space="preserve">
<value>info_159.png</value>
</data>
<data name="Homework" xml:space="preserve">
<value>homework_159.png</value>
</data>
<data name="Info" xml:space="preserve">
<value>info_159.png</value>
</data>
<data name="Lamb" xml:space="preserve">
<value>info_159.png</value>
</data>
<data name="Lectures" xml:space="preserve">
<value>lectures_159.png</value>
</data>
@@ -156,6 +174,9 @@
<data name="Phone" xml:space="preserve">
<value>phone_159.png</value>
</data>
<data name="Pig" xml:space="preserve">
<value>info_159.png</value>
</data>
<data name="Schedule" xml:space="preserve">
<value>schedule_159.png</value>
</data>
@@ -168,7 +189,13 @@
<data name="Update" xml:space="preserve">
<value>update_159.png</value>
</data>
<data name="Vegetarian" xml:space="preserve">
<value>info_159.png</value>
</data>
<data name="WebMail" xml:space="preserve">
<value>webmail_159.png</value>
</data>
<data name="Wild" xml:space="preserve">
<value>info_159.png</value>
</data>
</root>